Merge

2024-11-22 17:22:18 -05:00 · 2010-10-09 12:52:05 +02:00 · 2010-10-09 12:52:05 +02:00 · baf032760b
commit baf032760b
parent 3c21396a4f 8aec84afd9
34 changed files with 22776 additions and 233 deletions
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@ -5,7 +5,7 @@ type makeinc.skel >> makeinc.mak
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
 set OPATH=%PATH%
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin
 cd common
 nmake /nologo /f makefile.mak clean
 cd ..\fe-gtk
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@ -4,7 +4,7 @@ type makeinc.skel > makeinc.mak
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
 set OPATH=%PATH%
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\build\xchat-dev32\bin
 nmake /nologo /f makefile.mak clean
 cd pixmaps
 nmake /nologo /f makefile.mak
--- a/build/deps-x64.txt
+++ b/build/deps-x64.txt
@ -8,7 +8,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype_2.4.2-1_win6
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.18.1.1-2_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.0-1_win64.zip
--- a/build/deps-x86.txt
+++ b/build/deps-x86.txt
@ -8,7 +8,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win3
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.23-3_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win32.zip
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@ -2,8 +2,7 @@
 set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin
 set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin
 set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin
-set MINGW_BIN=c:\mozilla-build\mingw64\bin
-set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-x64\bin
+set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x64\bin
 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64
 copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
@ -25,14 +24,13 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
 copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
 copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
 copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
-copy %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%\libgcc_s_sjlj-1.dll.x64
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
 copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
 copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
 copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
 copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
-copy %ENCHANT_BIN%\libenchant-1.dll %XCHAT_DEST%\libenchant-1.dll.x64
+copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64
 copy %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64
 copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@ -2,8 +2,7 @@
 set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin
 set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin
 set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
-set MINGW_BIN=c:\mozilla-build\mingw32\bin
-set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-x86\bin
+set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x86\bin
 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
@ -29,7 +28,6 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
 copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
 copy %GTK_BIN%\intl.dll %XCHAT_DEST%
-copy %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%
 xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
@ -37,10 +35,15 @@ xcopy /q /s /i etc %XCHAT_DEST%\etc
 copy ..\COPYING %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
+copy %GTK_BIN%\..\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK
+copy %GTK_BIN%\..\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO
+copy %LUA_BIN%\..\COPYRIGHT %XCHAT_DEST%\LICENSE.LUA
+copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT
 copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
 copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
 copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
-copy %ENCHANT_BIN%\libenchant-1.dll %XCHAT_DEST%
+copy %SSL_BIN%\cert.pem %XCHAT_DEST%
+copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%
 xcopy /q /s /i %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\
 xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@ -1,9 +1,9 @@
 [Setup]
 AppName=XChat-WDK
-AppVerName=XChat-WDK 1468-2
-AppVersion=14.68.2
-VersionInfoVersion=14.68.2
-OutputBaseFilename=XChat-WDK 1468-2
+AppVerName=XChat-WDK 1469
+AppVersion=14.69
+VersionInfoVersion=14.69
+OutputBaseFilename=XChat-WDK 1469
 AppPublisher=XChat-WDK
 AppPublisherURL=http://code.google.com/p/xchat-wdk/
 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
@ -36,19 +36,18 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom

 [Components]
 Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed
-Name: "translations"; Description: "Translations"; Types: normal full custom
-Name: "spelling"; Description: "Spelling Library"; Types: full custom
-Name: "spelling\dict"; Description: "Dictionaries"; Types: full custom
-Name: "plugins"; Description: "Plugins"; Types: full custom
-Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom
-Name: "plugins\upd"; Description: "XChat-WDK Update Checker"; Types: normal full custom
-Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom
-Name: "langs"; Description: "Language Interfaces"; Types: full custom
-Name: "langs\lua"; Description: "Lua"; Types: full custom
-Name: "langs\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom
-Name: "langs\perl"; Description: "Perl"; Types: full custom
-Name: "langs\python"; Description: "Python"; Types: full custom
-Name: "langs\tcl"; Description: "Tcl"; Types: full custom
+Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning
+Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom; Flags: disablenouninstallwarning
+Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning
+Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs\perl"; Description: "Perl"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs\python"; Description: "Python"; Types: full custom; Flags: disablenouninstallwarning
+Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenouninstallwarning

 [Tasks]
 Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked
@ -63,15 +62,31 @@ Name: perl58; Description: "5.8"; GroupDescription: "Perl version:"; Flags: excl
 Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl
 Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl

+[Registry]
+Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable
+Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable
+Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable
+Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable
+Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable
+Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable
+
+[Run]
+Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent
+
 [Files]
+Source: "cert.pem"; DestDir: "{app}"; Components: libs
 Source: "COPYING"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.GTK"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs
 Source: "portable-mode"; DestDir: "{app}"; Tasks: portable
 Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs
 Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
-Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: spelling\dict
+Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: spelling



@ -151,16 +166,11 @@ Source: "ssleay32.dll.x64"; DestDir: "{app}"; DestName: "ssleay32.dll"; Componen
 Source: "zlib1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: libs; Tasks: x64

+Source: "libenchant.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libenchant.dll.x64"; DestDir: "{app}"; DestName: "libenchant.dll"; Components: libs; Tasks: x64

-
-Source: "libenchant-1.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86
-Source: "libenchant-1.dll.x64"; DestDir: "{app}"; DestName: "libenchant-1.dll"; Components: spelling; Tasks: x64
-
-Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: spelling; Tasks: x86
-Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: spelling; Tasks: x64
-
-Source: "libgcc_s_sjlj-1.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86
-Source: "libgcc_s_sjlj-1.dll.x64"; DestDir: "{app}"; DestName: "libgcc_s_sjlj-1.dll"; Components: spelling; Tasks: x64
+Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs; Tasks: x86
+Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: libs; Tasks: x64



--- a/config.h
+++ b/config.h
@ -4,7 +4,7 @@
 #define USE_PLUGIN
 #define USE_LIBSEXY
 #define PACKAGE_NAME "xchat"
-#define PACKAGE_VERSION "1468-2"
+#define PACKAGE_VERSION "1469"
 #define XCHATLIBDIR "."
 #define XCHATSHAREDIR "."
 #define OLD_PERL
--- a/ext/enchant-wdk/src/build-x64.bat
+++ b/ext/enchant-wdk/src/build-x64.bat
@ -0,0 +1,12 @@
+@echo off
+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
+set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
+set OPATH=%PATH%
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64
+nmake -f makefile.mak clean
+nmake -f makefile.mak X64=1 DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev64\include\glib-2.0
+echo.Press return when ready to install!
+pause
+set PATH=%OPATH%
+call release-x64.bat
+pause
--- a/ext/enchant-wdk/src/build-x86.bat
+++ b/ext/enchant-wdk/src/build-x86.bat
@ -0,0 +1,12 @@
+@echo off
+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
+set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
+set OPATH=%PATH%
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
+nmake -f makefile.mak clean
+nmake -f makefile.mak DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev32\include\glib-2.0
+echo.Press return when ready to install!
+pause
+set PATH=%OPATH%
+call release-x86.bat
+pause
--- a/ext/enchant-wdk/src/config.h
+++ b/ext/enchant-wdk/src/config.h
@ -0,0 +1,15 @@
+#include <sys/types.h>
+
+#ifndef SSIZE_T_DEFINED
+#ifdef ssize_t
+#undef ssize_t
+#endif
+#ifdef _WIN64
+typedef __int64          ssize_t;
+#else
+typedef _W64 int         ssize_t;
+#endif
+#define SSIZE_T_DEFINED
+#endif
+
+#define ENCHANT_VERSION_STRING "1.6.0"
--- a/ext/enchant-wdk/src/libenchant.rc
+++ b/ext/enchant-wdk/src/libenchant.rc
@ -0,0 +1,29 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION 1,6,0,1
+  PRODUCTVERSION 1,6,0,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+	VALUE "CompanyName", "none"
+	VALUE "FileDescription", "libenchant"
+	VALUE "FileVersion", "1.6.0.1"
+	VALUE "InternalName", "libenchant"
+	VALUE "OriginalFilename", "libenchant.dll"
+	VALUE "ProductName", "libenchant"
+	VALUE "ProductVersion", "1.6.0"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
--- a/ext/enchant-wdk/src/makefile.mak
+++ b/ext/enchant-wdk/src/makefile.mak
@ -0,0 +1,588 @@
+# -*- Makefile -*- for libenchant
+#
+# WDK fixes by Berke Viktor, 2010
+#
+# This makefile targets the Microsoft Visual C++ platform and is intended to build the enchant library along with its executables and test programs.
+# It was written by Tolon (alex@tolon.co.uk). He thinks it was originally based on an MSVC makefile from glib, but can't quite remember.
+# Tolon surrenders all rights regarding this file to the enchant project (http://www.abisource.com/enchant).
+# Please direct any comments, bug-fixes, etc. to alex@tolon.co.uk.
+#
+# Example of my usage of this makefile with MSVC9:
+#   NMAKE -f Makefile.msvc DLL=1 PREFIX=C:\usr-msvc9 GLIBDIR=D:\dev\lib\glib
+#
+# Example of my usage of this makefile with MSVC6:
+#   NMAKE -f Makefile.msvc DLL=1 PREFIX=C:\usr-msvc6 GLIBDIR=D:\dev\lib\glib MANIFEST=0
+#
+# This makefile expects glib-2.0.lib and gmodule-2.0.lib to be available in the $(PREFIX)\lib folder.
+
+ENCHANT_MAJOR_VERSION=1
+ENCHANT_MINOR_VERSION=6
+ENCHANT_MICRO_VERSION=0
+BUILDNUMBER=0
+ENCHANT_VERSION="$(ENCHANT_MAJOR_VERSION).$(ENCHANT_MINOR_VERSION).$(ENCHANT_MICRO_VERSION)"
+
+#### Start of system configuration section. ####
+
+# Flags that can be set on the nmake command line:
+#   DLL=1     for compiling a .dll with a stub .lib (default is a static .lib)
+#             Note that this works only with MFLAGS=-MD.
+#   MFLAGS={-ML|-MT|-MD} for defining the compilation model
+#     MFLAGS=-ML (the default)  Single-threaded, statically linked - libc.lib
+#     MFLAGS=-MT                Multi-threaded, statically linked  - libcmt.lib
+#     MFLAGS=-MD                Multi-threaded, dynamically linked - msvcrt.lib
+#   DEBUG=1   for compiling with debugging information
+#   PREFIX=Some\Directory       Base directory for installation
+#   IIPREFIX=Some\\Directory    Same thing with doubled backslashes
+#   GLIBDIR=Some\Directory      Path to glib include directory
+#   MANIFEST=0                  Disables embedding of manifest
+!if !defined(DLL)
+DLL=0
+!endif
+!if !defined(DEBUG)
+DEBUG=0
+!endif
+!if !defined(MFLAGS)
+!if !$(DLL)
+MFLAGS= 
+!else
+!if !$(DEBUG)
+MFLAGS=-MD
+!else
+MFLAGS=-MDd
+!endif
+!endif
+!endif
+!if !defined(PREFIX)
+PREFIX = c:\usr
+!endif
+!if !defined(IIPREFIX)
+IIPREFIX = c:\\usr
+!endif
+
+!if !defined(MANIFEST)
+MANIFEST=1
+!endif
+
+# Directories used by "make":
+glibdir = $(GLIBDIR)
+rootdir = .\..
+topsrcdir = $(rootdir)\src
+toptestdir = $(rootdir)\tests
+bindir=$(rootdir)\bin
+!if $(DEBUG)
+outdir=$(rootdir)\bin\debug
+!else
+outdir=$(rootdir)\bin\release
+!endif
+objdir=$(outdir)\obj
+pdbdir=$(outdir)\pdb
+libdir=$(outdir)
+
+# Directories used by "make install":
+prefix = $(PREFIX)
+exec_prefix = $(prefix)
+#bindir = $(exec_prefix)\bin
+#otherlibdir = $(exec_prefix)\lib
+otherlibdir = $(GLIBDIR)\..\..\lib
+includedir = $(prefix)\include
+#datadir = $(prefix)\share
+#localedir = $(datadir)\locale
+#aliaspath =
+#IIprefix = $(IIPREFIX)
+#IIexec_prefix = $(IIprefix)
+#IIbindir = $(IIexec_prefix)\\bin
+#IIlibdir = $(IIexec_prefix)\\lib
+#IIincludedir = $(IIprefix)\\include
+#IIdatadir = $(IIprefix)\\share
+#IIlocaledir = $(IIdatadir)\\locale
+#IIaliaspath =
+
+# Programs used by "make":
+
+CC = cl
+LINK = link
+MT = mt
+
+# Set to -W3 if you want to see maximum amount of warnings, including stupid
+# ones. Set to -W1 to avoid warnings about signed/unsigned combinations.
+WARN_CFLAGS = -W1
+
+!if $(DEBUG)
+OPTIMFLAGS = -Od
+!else
+# Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5.
+OPTIMFLAGS = -DNDEBUG -D_NDEBUG -Ox -MP2
+!endif
+
+OUTPUTFLAGS = \
+    -Fo"$(objdir)\\" 
+
+WINFLAGS = \
+    -DWINDOWS \
+    -D_WINDOWS \
+    -DWIN32 \
+    -D_WIN32 \
+    -DUNICODE \
+    -D_UNICODE
+
+DEBUGFLAGS = -Zi
+
+EXCEPTIONFLAGS = -EHsc
+
+CPPFLAGS = -D_STL70_ -D_STATIC_CPPLIB
+
+CFLAGS = \
+    -FI "$(topsrcdir)\config.h" \
+    $(MFLAGS) \
+    $(WARN_CFLAGS) \
+    $(EXCEPTIONFLAGS) \
+    $(OPTIMFLAGS) \
+	$(CPPFLAGS) \
+    $(WINFLAGS) \
+    $(OUTPUTFLAGS)
+
+INCLUDES = \
+    -I$(topsrcdir) \
+    -I$(rootdir) \
+    -I$(includedir) \
+    -I$(glibdir) \
+    -I$(glibdir)\glib \
+    -I$(glibdir)\gmodule \
+	-I$(glibdir)\..\..\lib\glib-2.0\include
+
+!ifdef X64
+LINKOBJ = msvcrt_win2003.obj
+MACHINE_FLAG = X64
+CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64
+!else
+MACHINE_FLAG = X86
+LINKOBJ = msvcrt_winxp.obj
+!endif
+
+LINKFLAGS = \
+    -INCREMENTAL:NO \
+    -MANIFEST \
+    -MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
+    -PDB:$(pdbdir)\\ \
+    -MACHINE:$(MACHINE_FLAG) \
+    -OPT:REF \
+    -OPT:ICF \
+    -DEBUG \
+	$(LINKOBJ)
+
+AR = lib
+AR_FLAGS = /out:
+
+LN = copy
+RM = -del
+
+# Programs used by "make install":
+INSTALL = copy
+INSTALL_PROGRAM = copy
+INSTALL_DATA = copy
+
+#### End of system configuration section. ####
+
+SHELL = /bin/sh
+
+CC_OBJ = $(CC) $(INCLUDES) $(CFLAGS) -c 
+
+CC_LINK = $(LINK) $(LINKFLAGS) 
+LINK_EXE = $(CC_LINK) /SUBSYSTEM:CONSOLE
+LINK_DLL = $(CC_LINK) /DLL /SUBSYSTEM:WINDOWS
+
+!if $(MANIFEST)
+EMBED_MANIFEST = $(MT) /manifest $(outdir)\exe_name.manifest /outputresource:"$(outdir)\exe_name;1"
+CLEAN_MANIFEST = $(RM) $(outdir)\exe_name.manifest
+!else
+EMBED_MANIFEST = 
+CLEAN_MANIFEST =
+!endif
+
+# test-enchantxx isn't part of all as it has problems on MSVC6.
+all: makedirs libenchant libenchant_ispell libenchant_myspell enchant enchant_lsmod test-enchant
+#all: makedirs libenchant libenchant_ispell enchant enchant_lsmod test-enchant
+
+makedirs: force
+    -mkdir $(bindir)
+    -mkdir $(outdir)
+    -mkdir $(libdir)
+    -mkdir $(objdir)
+    -mkdir $(pdbdir)
+
+################################################################################
+#### ENCHANT ####
+
+srcdir = $(toptestdir)
+
+ENCHANT_EXE=$(outdir)\enchant.exe
+ENCHANT_PDB=$(pdbdir)\enchant.pdb
+
+ENCHANT_DEFINES = \
+    -D_CONSOLE \
+    -DVERSION=\"$(ENCHANT_VERSION)\"
+    
+ENCHANT_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(libdir)\libenchant.lib
+
+ENCHANT_OBJECTS = \
+    $(objdir)\enchant-ispell.obj
+
+$(objdir)\enchant-ispell.obj : $(srcdir)\enchant-ispell.c
+	$(CC_OBJ) $** $(ENCHANT_DEFINES)
+
+enchant: $(ENCHANT_EXE)
+
+$(ENCHANT_EXE): $(ENCHANT_OBJECTS)
+	$(LINK_EXE) $(ENCHANT_OBJECTS) $(ENCHANT_LIBS) -OUT:$(ENCHANT_EXE)
+    $(EMBED_MANIFEST:exe_name=enchant.exe)
+    $(CLEAN_MANIFEST:exe_name=enchant.exe)
+    
+enchant_clean:
+    $(RM) $(ENCHANT_OBJECTS) $(ENCHANT_EXE) $(ENCHANT_PDB)
+
+################################################################################
+#### ENCHANT-LSMOD ####
+
+srcdir = $(toptestdir)
+
+ENCHANT_LSMOD_EXE=$(outdir)\enchant-lsmod.exe
+ENCHANT_LSMOD_PDB=$(pdbdir)\enchant-lsmod.pdb
+
+ENCHANT_LSMOD_DEFINES = \
+    -D_CONSOLE \
+    -DVERSION=\"$(ENCHANT_VERSION)\"
+    
+ENCHANT_LSMOD_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(libdir)\libenchant.lib
+
+ENCHANT_LSMOD_OBJECTS = \
+    $(objdir)\enchant-lsmod.obj
+
+$(objdir)\enchant-lsmod.obj : $(srcdir)\enchant-lsmod.c
+	$(CC_OBJ) $** $(ENCHANT_LSMOD_DEFINES)
+
+enchant_lsmod: $(ENCHANT_LSMOD_EXE) 
+
+$(ENCHANT_LSMOD_EXE): $(ENCHANT_LSMOD_OBJECTS)
+    $(LINK_EXE) $(ENCHANT_LSMOD_OBJECTS) $(ENCHANT_LSMOD_LIBS) -OUT:$(ENCHANT_LSMOD_EXE)
+    $(EMBED_MANIFEST:exe_name=enchant-lsmod.exe)
+    $(CLEAN_MANIFEST:exe_name=enchant-lsmod.exe)
+    
+enchant_lsmod_clean: 
+    $(RM) $(ENCHANT_LSMOD_OBJECTS) $(ENCHANT_LSMOD_EXE) $(ENCHANT_LSMOD_PDB)
+
+################################################################################
+#### TEST-ENCHANT ####
+
+srcdir = $(toptestdir)
+
+TEST_ENCHANT_EXE=$(outdir)\test-enchant.exe
+TEST_ENCHANT_PDB=$(pdbdir)\test-enchant.pdb
+
+TEST_ENCHANT_DEFINES = \
+    -D_CONSOLE \
+    -DVERSION=\"$(ENCHANT_VERSION)\"
+    
+TEST_ENCHANT_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(libdir)\libenchant.lib
+
+TEST_ENCHANT_OBJECTS = \
+    $(objdir)\test-enchant.obj
+
+$(objdir)\test-enchant.obj : $(srcdir)\test-enchant.c
+	$(CC_OBJ) $** $(TEST_ENCHANT_DEFINES)
+
+test-enchant: $(TEST_ENCHANT_EXE) 
+
+$(TEST_ENCHANT_EXE): $(TEST_ENCHANT_OBJECTS)
+    $(LINK_EXE) $(TEST_ENCHANT_OBJECTS) $(TEST_ENCHANT_LIBS) -OUT:$(TEST_ENCHANT_EXE)
+    $(EMBED_MANIFEST:exe_name=test-enchant.exe)
+    $(CLEAN_MANIFEST:exe_name=test-enchant.exe)
+    
+test-enchant_clean:
+    $(RM) $(TEST_ENCHANT_OBJECTS) $(TEST_ENCHANT_EXE) $(TEST_ENCHANT_PDB)
+
+################################################################################
+#### TEST-ENCHANTXX ####
+
+srcdir = $(toptestdir)
+
+TEST_ENCHANTXX_EXE=$(outdir)\test-enchantxx.exe
+TEST_ENCHANTXX_PDB=$(pdbdir)\test-enchantxx.pdb
+
+TEST_ENCHANTXX_DEFINES = \
+    -D_CONSOLE \
+    -DVERSION=\"$(ENCHANT_VERSION)\"
+    
+TEST_ENCHANTXX_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(libdir)\libenchant.lib
+
+TEST_ENCHANTXX_OBJECTS = \
+    $(objdir)\test-enchantxx.obj
+
+$(objdir)\test-enchantxx.obj : $(srcdir)\test-enchantxx.cpp
+	$(CC_OBJ) $** $(TEST_ENCHANTXX_DEFINES)
+
+test-enchantxx: $(TEST_ENCHANTXX_EXE) 
+
+$(TEST_ENCHANTXX_EXE): $(TEST_ENCHANTXX_OBJECTS)
+    $(LINK_EXE) $(TEST_ENCHANTXX_OBJECTS) $(TEST_ENCHANTXX_LIBS) -OUT:$(TEST_ENCHANTXX_EXE)
+    $(EMBED_MANIFEST:exe_name=test-enchantxx.exe)
+    $(CLEAN_MANIFEST:exe_name=test-enchantxx.exe)
+    
+test-enchantxx_clean:
+    $(RM) $(TEST_ENCHANTXX_OBJECTS) $(TEST_ENCHANTXX_EXE) $(TEST_ENCHANTXX_PDB)
+
+################################################################################
+#### LIBENCHANT ####
+
+srcdir = $(topsrcdir)
+
+LIBENCHANT_DEFINES = \
+    -D_ENCHANT_BUILD=1 \
+    -DWINDLL
+
+LIBENCHANT_DLL=$(outdir)\libenchant.dll
+LIBENCHANT_LIB=$(outdir)\libenchant.lib
+LIBENCHANT_PDB=$(pdbdir)\libenchant.pdb
+LIBENCHANT_RES=$(srcdir)\libenchant.res
+LIBENCHANT_RC=$(srcdir)\libenchant.rc
+
+LIBENCHANT_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(otherlibdir)\gmodule-2.0.lib \
+    advapi32.lib
+
+LIBENCHANT_OBJECTS = \
+    $(objdir)\enchant.obj \
+    $(objdir)\prefix.obj \
+    $(objdir)\pwl.obj
+
+
+
+$(objdir)\pwl.obj : $(srcdir)\pwl.c
+	$(CC_OBJ) $** $(LIBENCHANT_DEFINES)
+
+$(objdir)\prefix.obj : $(srcdir)\prefix.c
+	$(CC_OBJ) $** $(LIBENCHANT_DEFINES)
+
+$(objdir)\enchant.obj : $(srcdir)\enchant.c 
+	$(CC_OBJ) $** $(LIBENCHANT_DEFINES)
+    
+$(LIBENCHANT_RES) : $(LIBENCHANT_RC)
+	rc -Fo $(LIBENCHANT_RES) $(LIBENCHANT_RC)
+    
+!if !$(DLL)
+libenchant: LIBENCHANT_LIB
+libenchant_clean: libenchant_lib_clean
+!else
+libenchant: LIBENCHANT_DLL
+libenchant_clean: libenchant_dll_clean
+!endif
+
+LIBENCHANT_LIB : $(LIBENCHANT_OBJECTS)
+	-$(RM) libenchant.lib
+	$(AR) $(AR_FLAGS)$(LIBENCHANT_LIB) $(LIBENCHANT_OBJECTS)
+
+# libenchant.dll and libenchant.lib are created together.
+LIBENCHANT_DLL : $(LIBENCHANT_OBJECTS) $(LIBENCHANT_RES)
+	$(LINK_DLL) $(LIBENCHANT_OBJECTS) $(LIBENCHANT_LIBS) $(LIBENCHANT_RES) -OUT:$(LIBENCHANT_DLL)
+    $(EMBED_MANIFEST:exe_name=libenchant.dll)
+    $(CLEAN_MANIFEST:exe_name=libenchant.dll)
+
+libenchant_lib_clean:
+    $(RM) $(LIBENCHANT_OBJECTS) $(LIBENCHANT_LIB)
+
+libenchant_dll_clean:
+    $(RM) $(LIBENCHANT_OBJECTS) $(LIBENCHANT_LIB) $(LIBENCHANT_DLL) $(LIBENCHANT_PDB) $(LIBENCHANT_RES) $(LIBENCHANT_RC)
+
+################################################################################
+#### LIBENCHANT_ISPELL ####
+
+srcdir = $(topsrcdir)\ispell
+
+LIBENCHANT_ISPELL_DEFINES = \
+    -D "_ENCHANT_BUILD=1" \
+    -D "ISPELL_PROVIDER_EXPORTS" \
+    -D_USRDLL \
+    -D_WINDLL
+
+LIBENCHANT_ISPELL_DLL=$(outdir)\libenchant_ispell.dll
+LIBENCHANT_ISPELL_LIB=$(libdir)\libenchant_ispell.lib
+LIBENCHANT_ISPELL_PDB=$(pdbdir)\libenchant_ispell.pdb
+
+LIBENCHANT_ISPELL_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(otherlibdir)\gmodule-2.0.lib \
+    $(libdir)\libenchant.lib \
+    advapi32.lib ntstc_msvcrt.lib
+
+LIBENCHANT_ISPELL_OBJECTS = \
+    $(objdir)\correct.obj \
+    $(objdir)\good.obj \
+    $(objdir)\hash.obj \
+    $(objdir)\ispell_checker.obj \
+    $(objdir)\lookup.obj \
+    $(objdir)\makedent.obj \
+    $(objdir)\tgood.obj
+
+!if !$(DLL)
+libenchant_ispell: LIBENCHANT_ISPELL_LIB
+libenchant_ispell_clean: libenchant_ispell_lib_clean
+!else
+libenchant_ispell: LIBENCHANT_ISPELL_DLL
+libenchant_ispell_clean: libenchant_ispell_dll_clean
+!endif
+
+$(objdir)\correct.obj : $(srcdir)\correct.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+
+$(objdir)\good.obj : $(srcdir)\good.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+
+$(objdir)\hash.obj : $(srcdir)\hash.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+
+$(objdir)\ispell_checker.obj : $(srcdir)\ispell_checker.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+   
+$(objdir)\lookup.obj : $(srcdir)\lookup.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+    
+$(objdir)\makedent.obj : $(srcdir)\makedent.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+    
+$(objdir)\tgood.obj : $(srcdir)\tgood.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_ISPELL_DEFINES)
+    
+LIBENCHANT_ISPELL_LIB : $(LIBENCHANT_ISPELL_OBJECTS)
+	-$(RM) $(LIBENCHANT_ISPELL_LIB)
+	$(AR) $(AR_FLAGS)$(LIBENCHANT_ISPELL_LIB) $(LIBENCHANT_ISPELL_OBJECTS)
+
+# libenchant_ispell.dll and libenchant_ispell.lib are created together.
+LIBENCHANT_ISPELL_DLL : $(LIBENCHANT_ISPELL_OBJECTS)
+    $(LINK_DLL) $(LIBENCHANT_ISPELL_OBJECTS) $(LIBENCHANT_ISPELL_LIBS) -OUT:$(LIBENCHANT_ISPELL_DLL)
+    $(EMBED_MANIFEST:exe_name=libenchant_ispell.dll)
+    $(CLEAN_MANIFEST:exe_name=libenchant_ispell.dll)
+    
+libenchant_ispell_lib_clean:
+    $(RM) $(LIBENCHANT_ISPELL_OBJECTS) $(LIBENCHANT_ISPELL_LIB)
+
+libenchant_ispell_dll_clean:
+    $(RM) $(LIBENCHANT_ISPELL_OBJECTS) $(LIBENCHANT_ISPELL_LIB) $(LIBENCHANT_ISPELL_DLL) $(LIBENCHANT_ISPELL_PDB)
+
+################################################################################
+#### LIBENCHANT_MYSPELL ####
+
+srcdir = $(topsrcdir)\myspell
+
+LIBENCHANT_MYSPELL_DEFINES = \
+    -D "HUNSPELL_STATIC" \
+    -D "_ENCHANT_BUILD=1" \
+    -D "_USRDLL" \
+    -D "MYSPELL_PROVIDER_EXPORTS" \
+    -D "_WINDLL"
+    
+LIBENCHANT_MYSPELL_DLL=$(outdir)\libenchant_myspell.dll
+LIBENCHANT_MYSPELL_LIB=$(libdir)\libenchant_myspell.lib
+LIBENCHANT_MYSPELL_PDB=$(pdbdir)\libenchant_myspell.pdb
+
+LIBENCHANT_MYSPELL_LIBS = \
+    $(otherlibdir)\glib-2.0.lib \
+    $(otherlibdir)\gmodule-2.0.lib \
+    $(libdir)\libenchant.lib \
+    advapi32.lib ntstc_msvcrt.lib
+
+LIBENCHANT_MYSPELL_OBJECTS = \
+    $(objdir)\affentry.obj \
+    $(objdir)\affixmgr.obj \
+    $(objdir)\dictmgr.obj \
+    $(objdir)\csutil.obj \
+    $(objdir)\utf_info.obj \
+    $(objdir)\hashmgr.obj \
+    $(objdir)\suggestmgr.obj \
+    $(objdir)\hunspell.obj \
+    $(objdir)\filemgr.obj \
+    $(objdir)\phonet.obj \
+    $(objdir)\hunzip.obj \
+    $(objdir)\myspell_checker.obj
+        
+!if !$(DLL)
+libenchant_myspell: LIBENCHANT_MYSPELL_LIB
+libenchant_myspell_clean: libenchant_myspell_lib_clean
+!else
+libenchant_myspell: LIBENCHANT_MYSPELL_DLL
+libenchant_myspell_clean: libenchant_myspell_dll_clean
+!endif
+
+$(objdir)\affentry.obj : $(srcdir)\affentry.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+
+$(objdir)\affixmgr.obj : $(srcdir)\affixmgr.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+
+$(objdir)\dictmgr.obj : $(srcdir)\dictmgr.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+
+$(objdir)\csutil.obj : $(srcdir)\csutil.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+
+$(objdir)\utf_info.obj : $(srcdir)\utf_info.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\hashmgr.obj : $(srcdir)\hashmgr.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\suggestmgr.obj : $(srcdir)\suggestmgr.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\hunspell.obj : $(srcdir)\hunspell.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\filemgr.obj : $(srcdir)\filemgr.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\phonet.obj : $(srcdir)\phonet.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+   
+$(objdir)\hunzip.obj : $(srcdir)\hunzip.cxx
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+$(objdir)\myspell_checker.obj : $(srcdir)\myspell_checker.cpp
+	$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
+    
+LIBENCHANT_MYSPELL_LIB : $(LIBENCHANT_MYSPELL_OBJECTS)
+	-$(RM) $(LIBENCHANT_MYSPELL_LIB)
+	$(AR) $(AR_FLAGS)$(LIBENCHANT_MYSPELL_LIB) $(LIBENCHANT_MYSPELL_OBJECTS)
+
+# libenchant_myspell.dll and libenchant_myspell.lib are created together.
+LIBENCHANT_MYSPELL_DLL : $(LIBENCHANT_MYSPELL_OBJECTS)
+    $(LINK_DLL) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIBS) -OUT:$(LIBENCHANT_MYSPELL_DLL)
+    $(EMBED_MANIFEST:exe_name=libenchant_myspell.dll)
+    $(CLEAN_MANIFEST:exe_name=libenchant_myspell.dll)
+    
+libenchant_myspell_lib_clean:
+    $(RM) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIB)
+
+libenchant_myspell_dll_clean:
+    $(RM) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIB) $(LIBENCHANT_MYSPELL_DLL) $(LIBENCHANT_MYSPELL_PDB)
+
+################################################################################
+
+check : all
+
+mostlyclean : clean
+
+clean: libenchant_clean libenchant_ispell_clean libenchant_myspell_clean enchant_clean enchant_lsmod_clean test-enchant_clean test-enchantxx_clean
+
+distclean : clean
+
+maintainer-clean : distclean
+
+force :
+
--- a/ext/enchant-wdk/src/release-x64.bat
+++ b/ext/enchant-wdk/src/release-x64.bat
@ -0,0 +1,20 @@
+@echo off
+set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x64
+set RELEASE_DIR=..\bin\release
+rmdir /q /s %ENCHANT_DEST%
+mkdir %ENCHANT_DEST%
+copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING
+xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\
+copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin
+copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin
+xcopy /q /s /i enchant.h %ENCHANT_DEST%\include\enchant\
+copy "enchant++.h" %ENCHANT_DEST%\include\enchant\
+copy enchant-provider.h %ENCHANT_DEST%\include\enchant\
+xcopy /q /s /i %RELEASE_DIR%\libenchant_ispell.dll %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_ispell.exp %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_ispell.lib %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.dll %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.exp %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.lib %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant.exp %ENCHANT_DEST%\lib
+copy %RELEASE_DIR%\libenchant.lib %ENCHANT_DEST%\lib
--- a/ext/enchant-wdk/src/release-x86.bat
+++ b/ext/enchant-wdk/src/release-x86.bat
@ -0,0 +1,20 @@
+@echo off
+set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x86
+set RELEASE_DIR=..\bin\release
+rmdir /q /s %ENCHANT_DEST%
+mkdir %ENCHANT_DEST%
+copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING
+xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\
+copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin
+copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin
+xcopy /q /s /i enchant.h %ENCHANT_DEST%\include\enchant\
+copy "enchant++.h" %ENCHANT_DEST%\include\enchant\
+copy enchant-provider.h %ENCHANT_DEST%\include\enchant\
+xcopy /q /s /i %RELEASE_DIR%\libenchant_ispell.dll %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_ispell.exp %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_ispell.lib %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.dll %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.exp %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant_myspell.lib %ENCHANT_DEST%\lib\enchant\
+copy %RELEASE_DIR%\libenchant.exp %ENCHANT_DEST%\lib
+copy %RELEASE_DIR%\libenchant.lib %ENCHANT_DEST%\lib
--- a/ext/enchant/build-x64.bat
+++ b/ext/enchant/build-x64.bat
@ -1,8 +0,0 @@
-@echo off
-set PATH=c:\mozilla-build\mingw64\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev64\bin
-sh configure --exec-prefix=/usr/enchant-1.5.0-x64 --enable-myspell --enable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek
-pause
-make
-pause
-make install
-pause
--- a/ext/enchant/build-x86.bat
+++ b/ext/enchant/build-x86.bat
@ -1,8 +0,0 @@
-@echo off
-set PATH=c:\mozilla-build\mingw32\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev32\bin
-sh configure --exec-prefix=/usr/enchant-1.5.0-x86 --enable-myspell --enable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek
-pause
-make
-pause
-make install
-pause
--- a/ext/lua-wdk/build-x64.bat
+++ b/ext/lua-wdk/build-x64.bat
@ -2,7 +2,7 @@
 set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
 set DEST=..\lua-wdk-5.1.4-2-x64
 call etc\luavs-x64.bat
@echo off
--- a/ext/lua-wdk/build-x86.bat
+++ b/ext/lua-wdk/build-x86.bat
@ -2,7 +2,7 @@
 set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
 set DEST=..\lua-wdk-5.1.4-2-x86
 call etc\luavs.bat
@echo off
--- a/ext/nss-wdk/build-x64.bat
+++ b/ext/nss-wdk/build-x64.bat
@ -1,7 +1,7 @@
@echo off
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin
 set BUILD_OPT=1
 set USE_64=1
 set WINDDK_BUILD=1
--- a/ext/nss-wdk/build-x86.bat
+++ b/ext/nss-wdk/build-x86.bat
@ -1,7 +1,7 @@
@echo off
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin
 set BUILD_OPT=1
 set USE_64=
 set WINDDK_BUILD=1
--- a/ext/nss-wdk/nss-wdk.patch
+++ b/ext/nss-wdk/nss-wdk.patch
@ -1,6 +1,6 @@
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/dbm/include/mcom_db.h nss-3.12.7/mozilla/dbm/include/mcom_db.h
--- nss-3.12.7.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
-+++ nss-3.12.7/mozilla/dbm/include/mcom_db.h	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/dbm/include/mcom_db.h nss-3.12.8/mozilla/dbm/include/mcom_db.h
+--- nss-3.12.8.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
+++ nss-3.12.8/mozilla/dbm/include/mcom_db.h	2010-10-08 02:00:13 +0200
@@ -40,6 +40,15 @@
 #define off_t long
 #endif
@ -17,9 +17,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/dbm/include/mcom_db.h nss-
 #ifndef macintosh
 #include <sys/types.h>
 #endif
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/dbm/src/mktemp.c nss-3.12.7/mozilla/dbm/src/mktemp.c
--- nss-3.12.7.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:30 +0200
-+++ nss-3.12.7/mozilla/dbm/src/mktemp.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/dbm/src/mktemp.c nss-3.12.8/mozilla/dbm/src/mktemp.c
+--- nss-3.12.8.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:31 +0200
+++ nss-3.12.8/mozilla/dbm/src/mktemp.c	2010-10-08 02:00:13 +0200
@@ -45,13 +45,13 @@
 #include <ctype.h>
 #include "mcom_db.h"
@ -38,9 +38,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/dbm/src/mktemp.c nss-3.12.
 #endif
 
 static int _gettemp(char *path, register int *doopen, int extraFlags);
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/config/config.mk nss-3.12.7/mozilla/nsprpub/config/config.mk
--- nss-3.12.7.orig/mozilla/nsprpub/config/config.mk	2010-07-09 04:10:32 +0200
-+++ nss-3.12.7/mozilla/nsprpub/config/config.mk	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/nsprpub/config/config.mk nss-3.12.8/mozilla/nsprpub/config/config.mk
+--- nss-3.12.8.orig/mozilla/nsprpub/config/config.mk	2010-07-09 04:10:33 +0200
+++ nss-3.12.8/mozilla/nsprpub/config/config.mk	2010-10-08 02:00:13 +0200
@@ -154,6 +154,15 @@
 DEFINES += -DMOZ_UNICODE
 endif
@ -57,9 +57,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/config/config.mk n
 ####################################################################
 #
 # Configuration for the release process
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.7/mozilla/nsprpub/pr/src/Makefile.in
--- nss-3.12.7.orig/mozilla/nsprpub/pr/src/Makefile.in	2009-12-19 09:06:06 +0100
-+++ nss-3.12.7/mozilla/nsprpub/pr/src/Makefile.in	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in
+--- nss-3.12.8.orig/mozilla/nsprpub/pr/src/Makefile.in	2009-12-19 09:06:07 +0100
+++ nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in	2010-10-08 02:00:13 +0200
@@ -197,9 +197,17 @@
 ifdef NS_USE_GCC
 OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
@ -78,9 +78,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/Makefile.in
 
 ifeq ($(OS_ARCH),WINCE)
 OS_LIBS		= ws2.lib
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.7/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
--- nss-3.12.7.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2009-08-27 01:27:44 +0200
-+++ nss-3.12.7/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.8/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
+--- nss-3.12.8.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2009-08-27 01:27:45 +0200
+++ nss-3.12.8/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2010-10-08 02:00:13 +0200
@@ -624,7 +624,11 @@
      */
     hasFdInheritBuffer = (attr && attr->fdInheritBuffer);
@ -93,10 +93,10 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/md/windows/
     }
 
     if (envp != NULL) {
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.7/mozilla/security/coreconf/WIN32.mk
--- nss-3.12.7.orig/mozilla/security/coreconf/WIN32.mk	2010-06-24 01:28:52 +0200
-+++ nss-3.12.7/mozilla/security/coreconf/WIN32.mk	2010-08-16 18:47:14 +0200
-@@ -118,6 +118,14 @@
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.8/mozilla/security/coreconf/WIN32.mk
+--- nss-3.12.8.orig/mozilla/security/coreconf/WIN32.mk	2010-08-18 03:28:05 +0200
+++ nss-3.12.8/mozilla/security/coreconf/WIN32.mk	2010-10-08 02:00:13 +0200
+@@ -145,6 +145,14 @@
 else # !NS_USE_GCC
     OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS
     OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
@ -111,9 +111,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/WIN32.mk
     ifeq ($(_MSC_VER),$(_MSC_VER_6))
     ifndef MOZ_DEBUG_SYMBOLS
 	OS_DLLFLAGS += -PDB:NONE
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/arch.mk nss-3.12.7/mozilla/security/coreconf/arch.mk
--- nss-3.12.7.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:48 +0200
-+++ nss-3.12.7/mozilla/security/coreconf/arch.mk	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/coreconf/arch.mk nss-3.12.8/mozilla/security/coreconf/arch.mk
+--- nss-3.12.8.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49 +0200
+++ nss-3.12.8/mozilla/security/coreconf/arch.mk	2010-10-08 02:00:13 +0200
@@ -268,7 +268,15 @@
 # the uname.exe in the MSYS toolkit.
 #
@ -131,9 +131,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/arch.mk
     OS_ARCH = WINNT
     USE_MSYS = 1
     ifndef CPU_ARCH
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.7/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.12.7.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:32 +0200
-+++ nss-3.12.7/mozilla/security/nss/cmd/platlibs.mk	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk
+--- nss-3.12.8.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:33 +0200
+++ nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk	2010-10-08 02:00:13 +0200
@@ -249,3 +249,11 @@
 endif
 
@ -146,9 +146,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/platlibs.
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.7/mozilla/security/nss/cmd/selfserv/selfserv.c
--- nss-3.12.7.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-04-03 20:27:26 +0200
-+++ nss-3.12.7/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.8/mozilla/security/nss/cmd/selfserv/selfserv.c
+--- nss-3.12.8.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-04-03 20:27:27 +0200
+++ nss-3.12.8/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-10-08 02:00:13 +0200
@@ -51,8 +51,13 @@
 #endif
 
@ -163,9 +163,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/selfserv/
 
 #include <signal.h>
 #include <stdlib.h>
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.7/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
--- nss-3.12.7.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2009-03-10 21:18:06 +0100
-+++ nss-3.12.7/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
+--- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2009-03-10 21:18:07 +0100
+++ nss-3.12.8/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2010-10-08 02:00:13 +0200
@@ -80,7 +80,11 @@
 
 #elif defined(_MSC_VER)
@ -178,9 +178,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/mp
 
 void freebl_cpuid(unsigned long op, unsigned long *eax, 
            unsigned long *ebx, unsigned long *ecx, 
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.7/mozilla/security/nss/lib/freebl/win_rand.c
--- nss-3.12.7.orig/mozilla/security/nss/lib/freebl/win_rand.c	2009-07-15 05:34:04 +0200
-+++ nss-3.12.7/mozilla/security/nss/lib/freebl/win_rand.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.8/mozilla/security/nss/lib/freebl/win_rand.c
+--- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/win_rand.c	2009-07-15 05:34:04 +0200
+++ nss-3.12.8/mozilla/security/nss/lib/freebl/win_rand.c	2010-10-08 02:00:13 +0200
@@ -50,6 +50,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
@ -195,9 +195,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/wi
 #include <stdio.h>
 #include "prio.h"
 #include "prerror.h"
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.7/mozilla/security/nss/lib/softoken/legacydb/config.mk
--- nss-3.12.7.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 02:55:48 +0200
-+++ nss-3.12.7/mozilla/security/nss/lib/softoken/legacydb/config.mk	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.8/mozilla/security/nss/lib/softoken/legacydb/config.mk
+--- nss-3.12.8.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 02:55:49 +0200
+++ nss-3.12.8/mozilla/security/nss/lib/softoken/legacydb/config.mk	2010-10-08 02:00:13 +0200
@@ -96,3 +96,11 @@
 ifeq ($(OS_TARGET),WINCE)
 DEFINES += -DDBM_USING_NSPR
@ -210,9 +210,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/softoken/
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.7/mozilla/security/nss/lib/sqlite/sqlite3.c
--- nss-3.12.7.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 05:42:38 +0100
-+++ nss-3.12.7/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.8/mozilla/security/nss/lib/sqlite/sqlite3.c
+--- nss-3.12.8.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 05:42:38 +0100
+++ nss-3.12.8/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-10-08 02:00:13 +0200
@@ -10980,7 +10980,8 @@
 ** localtime_s().
 */
@ -223,10 +223,10 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/sqlite/sq
 #define HAVE_LOCALTIME_S 1
 #endif
 
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.7/mozilla/security/nss/lib/ssl/sslimpl.h
--- nss-3.12.7.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2010-02-10 00:33:50 +0100
-+++ nss-3.12.7/mozilla/security/nss/lib/ssl/sslimpl.h	2010-08-16 18:47:14 +0200
-@@ -1621,8 +1621,13 @@
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.8/mozilla/security/nss/lib/ssl/sslimpl.h
+--- nss-3.12.8.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2010-07-31 06:33:52 +0200
+++ nss-3.12.8/mozilla/security/nss/lib/ssl/sslimpl.h	2010-10-08 02:00:13 +0200
+@@ -1624,8 +1624,13 @@
 #elif defined(_WIN32_WCE)
 #define SSL_GETPID GetCurrentProcessId
 #elif defined(WIN32)
@ -240,9 +240,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/ssl/sslim
 #else
 #define SSL_GETPID() 0
 #endif
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.7/mozilla/security/nss/lib/zlib/config.mk
--- nss-3.12.7.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 01:13:10 +0100
-+++ nss-3.12.7/mozilla/security/nss/lib/zlib/config.mk	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.8/mozilla/security/nss/lib/zlib/config.mk
+--- nss-3.12.8.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 01:13:10 +0100
+++ nss-3.12.8/mozilla/security/nss/lib/zlib/config.mk	2010-10-08 02:00:13 +0200
@@ -46,3 +46,11 @@
 PROGRAM        =
 
@ -255,9 +255,9 @@ diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/zlib/conf
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.7/mozilla/security/nss/lib/zlib/gzio.c
--- nss-3.12.7.orig/mozilla/security/nss/lib/zlib/gzio.c	2009-11-07 01:13:10 +0100
-+++ nss-3.12.7/mozilla/security/nss/lib/zlib/gzio.c	2010-08-16 18:47:14 +0200
+diff -ruN --strip-trailing-cr nss-3.12.8.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.8/mozilla/security/nss/lib/zlib/gzio.c
+--- nss-3.12.8.orig/mozilla/security/nss/lib/zlib/gzio.c	2009-11-07 01:13:10 +0100
+++ nss-3.12.8/mozilla/security/nss/lib/zlib/gzio.c	2010-10-08 02:00:13 +0200
@@ -11,6 +11,12 @@
 
 #include "zutil.h"
--- a/ext/openssl-wdk/build-x64.bat
+++ b/ext/openssl-wdk/build-x64.bat
@ -1,14 +1,27 @@
@echo off
+set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x64
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x64\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\zlib-x64\lib
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin
-perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x64
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin
+perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=./
 call ms\do_win64a
 nmake -f ms\ntdll.mak vclean
 nmake -f ms\ntdll.mak
 nmake -f ms\ntdll.mak test
+perl mk-ca-bundle.pl -n
 echo.Press return when ready to install!
 pause
+move include include-orig
 nmake -f ms\ntdll.mak install
-perl util\copy.pl c:/mozilla-build/build/zlib-x64/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x64/bin
+rmdir /q /s %OPENSSL_DEST%
+mkdir %OPENSSL_DEST%
+move bin %OPENSSL_DEST%
+move include %OPENSSL_DEST%
+move lib %OPENSSL_DEST%
+mkdir %OPENSSL_DEST%\share
+move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example
+move include-orig include
+copy c:\mozilla-build\build\zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin
+move cert.pem %OPENSSL_DEST%\bin
 echo.Finished!
+pause
--- a/ext/openssl-wdk/build-x86.bat
+++ b/ext/openssl-wdk/build-x86.bat
@ -1,15 +1,28 @@
@echo off
+set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x86
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x86\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\zlib-x86\lib
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin
-perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x86
+set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin
+perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=./
 call ms\do_nasm
@echo off
 nmake -f ms\ntdll.mak vclean
 nmake -f ms\ntdll.mak
 nmake -f ms\ntdll.mak test
+perl mk-ca-bundle.pl -n
 echo.Press return when ready to install!
 pause
+move include include-orig
 nmake -f ms\ntdll.mak install
-perl util\copy.pl c:/mozilla-build/build/zlib-x86/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x86/bin
+rmdir /q /s %OPENSSL_DEST%
+mkdir %OPENSSL_DEST%
+move bin %OPENSSL_DEST%
+move include %OPENSSL_DEST%
+move lib %OPENSSL_DEST%
+mkdir %OPENSSL_DEST%\share
+move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example
+move include-orig include
+copy c:\mozilla-build\build\zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin
+move cert.pem %OPENSSL_DEST%\bin
 echo.Finished!
+pause
--- a/ext/openssl-wdk/certdata.txt
+++ b/ext/openssl-wdk/certdata.txt
--- a/ext/openssl-wdk/mk-ca-bundle.pl
+++ b/ext/openssl-wdk/mk-ca-bundle.pl
@ -0,0 +1,193 @@
+#!/usr/bin/perl -w
+# ***************************************************************************
+# *                                  _   _ ____  _
+# *  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 http://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.
+# *
+# * $Id: mk-ca-bundle.pl,v 1.10 2008/02/15 00:41:54 gknauf Exp $
+# ***************************************************************************
+# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. 
+# It downloads certdata.txt from Mozilla's source tree (see URL below),
+# then parses certdata.txt and extracts CA Root Certificates into PEM format.
+# These are then processed with the OpenSSL commandline tool to produce the
+# final ca-bundle.crt file.
+# The script is based on the parse-certs script written by Roland Krikava.
+# This Perl script works on almost any platform since its only external
+# dependency is the OpenSSL commandline tool for optional text listing.
+# Hacked by Guenter Knauf.
+#
+# Hacked again by Cameron Kaiser to use cURL *instead* of LWP.
+#
+use Getopt::Std;
+use MIME::Base64;
+#use LWP::UserAgent;
+use strict;
+use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);  
+
+my $url = 'http://mxr.mozilla.org/seamonkey/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1';
+# If the OpenSSL commandline is not in search path you can configure it here!
+my $openssl = 'openssl';
+
+my $version = $1 if ('$Revision: 1.10 $' =~ /\s(\d+\.\d+)\s/);
+
+getopts('bhilnqtuv');
+
+if ($opt_i) {
+  print ("=" x 78 . "\n");
+  print "Script Version            : $version\n";
+  print "Perl Version              : $]\n";
+  print "Operating System Name     : $^O\n";
+  print "Getopt::Std.pm Version    : ${Getopt::Std::VERSION}\n";
+  print "MIME::Base64.pm Version   : ${MIME::Base64::VERSION}\n";
+#  print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n";
+#  print "LWP.pm Version            : ${LWP::VERSION}\n";
+  print "This version uses cURL. As it should.\n";
+  print `curl --version`;
+  print ("=" x 78 . "\n");
+}
+
+$0 =~ s/\\/\//g;
+$0 = substr($0, rindex($0, '/') + 1);
+if ($opt_h) {
+  printf("Usage:\t%s [-b] [-i] [-l] [-n] [-q] [-t] [-u] [-v] [<outputfile>]\n", $0);
+  print "\t-b\tbackup an existing version of ca-bundle.crt\n";
+  print "\t-i\tprint version info about used modules\n";
+  print "\t-l\tprint license info about certdata.txt\n";
+  print "\t-n\tno download of certdata.txt (to use existing)\n";
+  print "\t-q\tbe really quiet (no progress output at all)\n";
+  print "\t-t\tinclude plain text listing of certificates\n";
+  print "\t-u\tunlink (remove) certdata.txt after processing\n";
+  print "\t-v\tbe verbose and print out processed CAs\n";
+  exit;
+}
+
+#my $crt = $ARGV[0] || 'ca-bundle.crt';
+my $crt = $ARGV[0] || 'cert.pem';
+my $txt = substr($url, rindex($url, '/') + 1);
+$txt =~ s/\?.*//;
+
+if (!$opt_n || !-e $txt) {
+  print "Downloading '$txt' ...\n" if (!$opt_q);
+  #my $ua  = new LWP::UserAgent(agent => "$0/$version");
+  #my $req = new HTTP::Request('GET', $url);
+  #my $res = $ua->request($req);
+  #if ($res->is_success) {
+  #  open(TXT,">$txt") or die "Couldn't open $txt: $!";
+  #  print TXT $res->content . "\n";
+  #  close(TXT) or die "Couldn't close $txt: $!";
+  #} else {
+  #  die $res->status_line;
+  #}
+  system("curl $url > $txt");
+}
+
+if ($opt_b && -e $crt) {
+  my $bk = 1;
+  while (-e "$crt.~${bk}~") {
+    $bk++;
+  }
+  rename $crt, "$crt.~${bk}~";
+}
+
+my $format = $opt_t ? "plain text and " : "";
+my $currentdate = scalar gmtime() . " UTC";
+open(CRT,">$crt") or die "Couldn't open $crt: $!";
+print CRT <<EOT;
+##
+## $crt -- Bundle of CA Root Certificates
+##
+## Converted at: ${currentdate}
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt'
+##
+## It contains the certificates in ${format}PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+EOT
+
+close(CRT) or die "Couldn't close $crt: $!";
+
+print "Processing  '$txt' ...\n" if (!$opt_q);
+my $caname;
+my $certnum = 0;
+open(TXT,"$txt") or die "Couldn't open $txt: $!";
+while (<TXT>) {
+  if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT;
+    print if ($opt_l);
+    while (<TXT>) {
+      print CRT;
+      print if ($opt_l);
+      last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/);
+    }
+    close(CRT) or die "Couldn't close $crt: $!";
+  }
+  next if /^#|^\s*$/;
+  chomp;
+  if (/^CVS_ID\s+\"(.*)\"/) {
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT "# $1\n";
+    close(CRT) or die "Couldn't close $crt: $!";
+  }
+  if (/^CKA_LABEL\s+[A-Z0-9]+\s+\"(.*)\"/) {
+    $caname = $1;
+  }
+  if (/^CKA_VALUE MULTILINE_OCTAL/) {
+    my $data;
+    while (<TXT>) {
+      last if (/^END/);
+      chomp;
+      my @octets = split(/\\/);
+      shift @octets;
+      for (@octets) {
+        $data .= chr(oct);
+      }
+    }
+    my $pem = "-----BEGIN CERTIFICATE-----\n"
+            . MIME::Base64::encode($data)
+            . "-----END CERTIFICATE-----\n";
+    open(CRT, ">>$crt") or die "Couldn't open $crt: $!";
+    print CRT "\n$caname\n";
+    print CRT ("=" x length($caname) . "\n");
+    if (!$opt_t) {
+      print CRT $pem;
+    }
+    close(CRT) or die "Couldn't close $crt: $!";
+    if ($opt_t) {
+      open(TMP, "|$openssl x509 -md5 -fingerprint -text -inform PEM >> $crt") or die "Couldn't open openssl pipe: $!";
+      print TMP $pem;
+      close(TMP) or die "Couldn't close openssl pipe: $!";
+    }
+    print "Parsing: $caname\n" if ($opt_v);
+    $certnum ++;
+  }
+}
+close(TXT) or die "Couldn't close $txt: $!";
+unlink $txt if ($opt_u);
+print "Done ($certnum CA certs processed).\n" if (!$opt_q);
+
+exit;
+
+
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@ -35,7 +35,7 @@ char*
 check_version ()
 {
 	HINTERNET hINet, hFile;
-	hINet = InternetOpen ("XChat-WDK Update Checker", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
+	hINet = InternetOpen ("Update Checker", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
 	
 	if (!hINet)
 	{
@ -91,12 +91,12 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 {
 	ph = plugin_handle;

-	*plugin_name = "XChat-WDK Update Checker";
+	*plugin_name = "Update Checker";
 	*plugin_desc = "Plugin for checking for XChat-WDK updates";
 	*plugin_version = "1.0";

 	xchat_hook_command (ph, "UPDCHK", XCHAT_PRI_NORM, print_version, 0, 0);
-	xchat_print (ph, "XChat-WDK Update Checker plugin loaded\n");
+	xchat_print (ph, "Update Checker plugin loaded\n");
 	print_version ();

 	return 1;       /* return 1 for success */
@ -105,6 +105,6 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 int
 xchat_plugin_deinit (void)
 {
-	xchat_print (ph, "XChat-WDK Update Checker plugin unloaded\n");
+	xchat_print (ph, "Update Checker plugin unloaded\n");
 	return 1;
 }
--- a/plugins/xtray/makefile.mak
+++ b/plugins/xtray/makefile.mak
@ -23,7 +23,7 @@ xtray.def:
 	$(CC) $(CPPFLAGS) /c $<

 res:
-	rc resource.rc
+	rc /nologo resource.rc
 	
 $(TARGET): $(TRAY_OBJECTS) xtray.def res
 	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) $(TRAY_OBJECTS) ntstc_msvcrt.lib $(LIBS) /def:xtray.def resource.res
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@ -17,11 +17,8 @@ all: $(PROG)
 $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
 	$(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj

-xchat.rc:
-	echo XC_ICON ICON "../../xchat.ico" > xchat.rc
-
 xchat.res: xchat.rc ../../xchat.ico
-	rc /r xchat.rc
+	rc /nologo /r xchat.rc

 xchat-icon.obj: xchat.res
 	cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
@ -29,5 +26,4 @@ xchat-icon.obj: xchat.res
 clean:
 	@del *.obj
 	@del $(PROG)
-	@del xchat.rc
 	@del xchat.res
--- a/src/fe-gtk/typedef.h
+++ b/src/fe-gtk/typedef.h
@ -0,0 +1,11 @@
+#ifndef SSIZE_T_DEFINED
+#ifdef ssize_t
+#undef ssize_t
+#endif
+#ifdef _WIN64
+typedef __int64          ssize_t;
+#else
+typedef _W64 int         ssize_t;
+#endif
+#define SSIZE_T_DEFINED
+#endif
--- a/src/fe-gtk/xchat.rc
+++ b/src/fe-gtk/xchat.rc
@ -0,0 +1,22 @@
+#include <winver.h>
+#include "../../config.h"
+
+XC_ICON ICON "../../xchat.ico" 
+
+VS_VERSION_INFO VERSIONINFO
+	BEGIN
+		BLOCK "StringFileInfo"
+		BEGIN
+			BLOCK "040904B0"
+			BEGIN
+				
+				VALUE "FileDescription", "XChat-WDK IRC Client"
+				VALUE "ProductName", "XChat-WDK" 
+				VALUE "ProductVersion", PACKAGE_VERSION
+			END
+		END
+		BLOCK "VarFileInfo"
+		BEGIN
+			VALUE "Translation", 0x0409, 0x04B0
+		END
+	END
--- a/src/makefile.mak
+++ b/src/makefile.mak
@ -11,7 +11,6 @@ clean:
 	@del common\xchatcommon.lib
 	@del fe-gtk\*.obj
 	@del fe-gtk\xchat.exe
-	@del fe-gtk\xchat.rc
 	@del fe-gtk\xchat.res
 #	@del fe-text\*.obj
 #	@del fe-text\xchat-text.exe
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1468-2
+1469
--- a/xchat-wdk.patch
+++ b/xchat-wdk.patch
@ -1,6 +1,6 @@
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c
 --- xchat-wdk.orig/plugins/perl/perl.c	2010-08-26 04:18:04 +0200
-+++ xchat-wdk/plugins/perl/perl.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/plugins/perl/perl.c	2010-10-08 04:16:18 +0200
@@ -22,12 +22,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
@ -41,7 +41,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi
 			}
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c
 --- xchat-wdk.orig/plugins/python/python.c	2010-05-16 06:31:54 +0200
-+++ xchat-wdk/plugins/python/python.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/plugins/python/python.c	2010-10-08 04:16:18 +0200
@@ -53,10 +53,10 @@
 
 #include <glib.h>
@ -103,7 +103,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
 		if (m == NULL) {
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c
 --- xchat-wdk.orig/plugins/tcl/tclplugin.c	2010-03-21 01:49:42 +0100
-+++ xchat-wdk/plugins/tcl/tclplugin.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/plugins/tcl/tclplugin.c	2010-10-08 04:16:18 +0200
@@ -32,8 +32,6 @@
 #include <windows.h>
 #define bzero(mem, sz) memset((mem), 0, (sz))
@ -124,7 +124,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
     FreeLibrary(lib);
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugins/xdcc/xdcc.c
 --- xchat-wdk.orig/plugins/xdcc/xdcc.c	2002-12-26 04:35:09 +0100
-+++ xchat-wdk/plugins/xdcc/xdcc.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/plugins/xdcc/xdcc.c	2010-10-08 04:16:18 +0200
@@ -2,11 +2,11 @@
 
 #include <glib.h>
@ -140,7 +140,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugi
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
 --- xchat-wdk.orig/src/common/cfgfiles.c	2010-08-07 09:14:45 +0200
-+++ xchat-wdk/src/common/cfgfiles.c	2010-10-05 04:55:22 +0200
+++ xchat-wdk/src/common/cfgfiles.c	2010-10-09 04:48:33 +0200
@@ -17,7 +17,6 @@
  */
 
@ -187,6 +187,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
 	}
 	return xdir_fs;
 }
+@@ -393,7 +398,7 @@
+ 	{"dcc_blocksize", P_OFFINT (dcc_blocksize), TYPE_INT},
+ 	{"dcc_completed_dir", P_OFFSET (dcc_completed_dir), TYPE_STR},
+ 	{"dcc_dir", P_OFFSET (dccdir), TYPE_STR},
+-	{"dcc_fast_send", P_OFFINT (fastdccsend), TYPE_BOOL},
+	/* {"dcc_fast_send", P_OFFINT (fastdccsend), TYPE_BOOL}, */
+ 	{"dcc_global_max_get_cps", P_OFFINT (dcc_global_max_get_cps), TYPE_INT},
+ 	{"dcc_global_max_send_cps", P_OFFINT (dcc_global_max_send_cps), TYPE_INT},
+ 	{"dcc_ip", P_OFFSET (dcc_ip_str), TYPE_STR},
@@ -536,6 +541,7 @@
 
 	{"tab_chans", P_OFFINT (tabchannels), TYPE_BOOL},
@ -216,6 +225,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
 	{"text_wordwrap", P_OFFINT (wordwrap), TYPE_BOOL},
 
 	{0, 0, 0},
+@@ -624,7 +632,7 @@
+ 	prefs.indent_nicks = 1;
+ 	prefs.thin_separator = 1;
+ 	prefs._tabs_position = 2; /* 2 = left */
+-	prefs.fastdccsend = 1;
+	/* prefs.fastdccsend = 1; */
+ 	prefs.wordwrap = 1;
+ 	prefs.autosave = 1;
+ 	prefs.autodialog = 1;
@@ -648,6 +656,7 @@
 	prefs.dialog_height = 256;
 	prefs.gui_join_dialog = 1;
@ -226,7 +244,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
 	prefs.notify_timeout = 15;
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/common/chanopt.c
 --- xchat-wdk.orig/src/common/chanopt.c	2008-06-15 06:40:29 +0200
-+++ xchat-wdk/src/common/chanopt.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/src/common/chanopt.c	2010-10-08 04:16:18 +0200
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <string.h>
@ -237,7 +255,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/
 #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/common/ctcp.c
 --- xchat-wdk.orig/src/common/ctcp.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/ctcp.c	2010-10-05 03:55:26 +0200
+++ xchat-wdk/src/common/ctcp.c	2010-10-09 11:36:58 +0200
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
@ -251,13 +269,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/com
 	if (!strcasecmp (msg, "VERSION") && !prefs.hidever)
 	{
 -		snprintf (outbuf, sizeof (outbuf), "VERSION xchat "PACKAGE_VERSION" %s",
-+		snprintf (outbuf, sizeof (outbuf), "VERSION xchat-wdk "PACKAGE_VERSION" ("PACKAGE_TARNAME") %s",
+		snprintf (outbuf, sizeof (outbuf), "VERSION XChat-WDK "PACKAGE_VERSION" / %s",
 					 get_cpu_str ());
 		serv->p_nctcp (serv, nick, outbuf);
 	}
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/common/dcc.c
 --- xchat-wdk.orig/src/common/dcc.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/dcc.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/dcc.c	2010-10-09 05:17:54 +0200
@@ -31,7 +31,6 @@
 #include <time.h>
 #include <errno.h>
@ -266,18 +284,28 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/comm
 #include <fcntl.h>
 
 #define WANTSOCKET
-@@ -1984,7 +1983,7 @@
+@@ -57,6 +56,7 @@
+ 
+ #ifdef USE_DCC64
+ #define BIG_STR_TO_INT(x) strtoull(x,NULL,10)
+#define stat _stat64
+ #else
+ #define BIG_STR_TO_INT(x) strtoul(x,NULL,10)
+ #endif
+@@ -1983,9 +1983,7 @@
+ 		return TRUE;
 
 	/* now handle case-insensitive Filesystems: HFS+, FAT */
- #ifdef WIN32
+-#ifdef WIN32
 -#warning no win32 implementation - behaviour may be unreliable
-+/* warning no win32 implementation - behaviour may be unreliable */
- #else
+-#else
+#ifndef WIN32
 	/* this fstat() shouldn't really fail */
 	if ((dcc->fp == -1 ? stat (dcc->destfile_fs, &st_a) : fstat (dcc->fp, &st_a)) == -1)
+ 		return FALSE;
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/common/ignore.c
 --- xchat-wdk.orig/src/common/ignore.c	2006-04-15 09:00:39 +0200
-+++ xchat-wdk/src/common/ignore.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/ignore.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <stdio.h>
@ -288,7 +316,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/c
 #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/common/inbound.c
 --- xchat-wdk.orig/src/common/inbound.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/inbound.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/inbound.c	2010-10-08 04:16:18 +0200
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <stdio.h>
@ -299,7 +327,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/
 #define WANTARPA
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h
 --- xchat-wdk.orig/src/common/inet.h	2005-09-03 12:57:48 +0200
-+++ xchat-wdk/src/common/inet.h	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/inet.h	2010-10-08 04:16:18 +0200
@@ -24,9 +24,8 @@
 #ifdef USE_IPV6
 #include <winsock2.h>
@ -313,7 +341,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/com
 #define set_blocking(sok)	{ \
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/common/msproxy.c
 --- xchat-wdk.orig/src/common/msproxy.c	2006-04-16 17:32:17 +0200
-+++ xchat-wdk/src/common/msproxy.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/msproxy.c	2010-10-08 04:16:18 +0200
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <string.h>
@ -324,7 +352,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/
 #define WANTSOCKET
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/common/network.c
 --- xchat-wdk.orig/src/common/network.c	2006-04-16 10:11:26 +0200
-+++ xchat-wdk/src/common/network.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/network.c	2010-10-08 04:16:18 +0200
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
@ -335,7 +363,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/
 #include "../../config.h"				  /* grab USE_IPV6 and LOOKUPD defines */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/common/notify.c
 --- xchat-wdk.orig/src/common/notify.c	2008-06-08 09:58:58 +0200
-+++ xchat-wdk/src/common/notify.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/notify.c	2010-10-08 04:16:18 +0200
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
@ -346,7 +374,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/c
 #include "xchat.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src/common/outbound.c
 --- xchat-wdk.orig/src/common/outbound.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/outbound.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/outbound.c	2010-10-09 02:06:49 +0200
@@ -32,7 +32,6 @@
 #include <sys/wait.h>
 #endif
@ -357,7 +385,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
 #include <sys/stat.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c
 --- xchat-wdk.orig/src/common/plugin-timer.c	2005-02-02 11:03:51 +0100
-+++ xchat-wdk/src/common/plugin-timer.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/plugin-timer.c	2010-10-08 04:16:18 +0200
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
@ -369,7 +397,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk
 #define strcasecmp stricmp
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c
 --- xchat-wdk.orig/src/common/plugin.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/common/plugin.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/plugin.c	2010-10-08 04:16:18 +0200
@@ -34,7 +34,7 @@
 #include "text.h"
 #define PLUGIN_C
@ -390,7 +418,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/c
 	{
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c
 --- xchat-wdk.orig/src/common/proto-irc.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/proto-irc.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/proto-irc.c	2010-10-08 04:16:18 +0200
@@ -18,7 +18,6 @@
 
 /* IRC RFC1459(+commonly used extensions) protocol implementation */
@ -401,7 +429,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr
 #include <stdlib.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/common/server.c
 --- xchat-wdk.orig/src/common/server.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/server.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/server.c	2010-10-08 04:16:18 +0200
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <string.h>
@ -410,16 +438,20 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
 #include <errno.h>
 #include <fcntl.h>
 
-@@ -1390,7 +1389,7 @@
+@@ -1388,12 +1387,7 @@
+ static int
+ http_read_line (int print_fd, int sok, char *buf, int len)
 {
- #ifdef WIN32
- 	/* make sure waitline() uses recv() or it'll fail on win32 */
+-#ifdef WIN32
+-	/* make sure waitline() uses recv() or it'll fail on win32 */
 -	len = waitline (sok, buf, len, FALSE);
-+	len = waitline (sok, buf, len, TRUE);
- #else
+-#else
 	len = waitline (sok, buf, len, TRUE);
- #endif
-@@ -1738,7 +1737,7 @@
+-#endif
+ 	if (len >= 1)
+ 	{
+ 		/* print the message out (send it to the parent process) */
+@@ -1738,7 +1732,7 @@
 	}
 #endif
 	serv->childpid = pid;
@ -430,7 +462,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src/common/servlist.c
 --- xchat-wdk.orig/src/common/servlist.c	2010-05-16 09:43:49 +0200
-+++ xchat-wdk/src/common/servlist.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/servlist.c	2010-10-08 04:16:18 +0200
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <sys/types.h>
@ -441,7 +473,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src
 #include <glib/ghash.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c
 --- xchat-wdk.orig/src/common/ssl.c	2007-03-28 10:35:06 +0200
-+++ xchat-wdk/src/common/ssl.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/ssl.c	2010-10-08 04:16:18 +0200
@@ -17,12 +17,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
@ -458,7 +490,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm
 #ifndef HAVE_SNPRINTF
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c
 --- xchat-wdk.orig/src/common/text.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/text.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/text.c	2010-10-08 04:16:18 +0200
@@ -19,13 +19,11 @@
 #include <stdlib.h>
 #include <stdio.h>
@ -536,7 +568,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/com
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c
 --- xchat-wdk.orig/src/common/util.c	2008-02-07 02:50:37 +0100
-+++ xchat-wdk/src/common/util.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/util.c	2010-10-09 11:07:53 +0200
@@ -16,11 +16,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
@ -583,25 +615,75 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
 
 #ifdef USE_DEBUG
 
-@@ -631,22 +632,32 @@
- 	OSVERSIONINFO osvi;
- 	SYSTEM_INFO si;
+@@ -628,26 +629,79 @@
+ get_cpu_str (void)
+ {
+ 	static char verbuf[64];
+-	OSVERSIONINFO osvi;
+-	SYSTEM_INFO si;
+	static char winver[20];
+	OSVERSIONINFOEX osvi;
 	double mhz;
-+	int cpu_arch;
 
- 	osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+-	osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+	osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
 	GetVersionEx (&osvi);
- 	GetSystemInfo (&si);
- 
-+	if (si.wProcessorArchitecture == 9)
-+	{
-+		cpu_arch = 64;
-+	}
-+	else
-+	{
-+		cpu_arch = 86;
-+	}
+-	GetSystemInfo (&si);
 +
+	switch (osvi.dwMajorVersion)
+	{
+		case 5:
+			switch (osvi.dwMinorVersion)
+			{
+				case 1:
+					strcpy (winver, "XP");
+					break;
+				case 2:
+					if (osvi.wProductType == VER_NT_WORKSTATION)
+					{
+						strcpy (winver, "XP x64 Edition");
+					}
+					else
+					{
+						if (GetSystemMetrics(SM_SERVERR2) == 0)
+						{
+							strcpy (winver, "Server 2003");
+						}
+						else
+						{
+							strcpy (winver, "Server 2003 R2");
+						}
+					}
+					break;
+			}
+			break;
+		case 6:
+			switch (osvi.dwMinorVersion)
+			{
+				case 0:
+					if (osvi.wProductType == VER_NT_WORKSTATION)
+					{
+						strcpy (winver, "Vista");
+					}
+					else
+					{
+						strcpy (winver, "Server 2008");
+					}
+					break;
+				case 1:
+					if (osvi.wProductType == VER_NT_WORKSTATION)
+					{
+						strcpy (winver, "7");
+					}
+					else
+					{
+						strcpy (winver, "Server 2008 R2");
+					}
+					break;
+			}
+			break;
+	}
+ 
 	mhz = get_mhz ();
 	if (mhz)
 	{
@ -609,20 +691,24 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
 		const char *cpuspeedstr = ( mhz > 1000 ) ? "GHz" : "MHz";
 -		sprintf (verbuf, "Windows %ld.%ld [i%d86/%.2f%s]",
 -					osvi.dwMajorVersion, osvi.dwMinorVersion, si.wProcessorLevel, 
-+		sprintf (verbuf, "Windows %ld.%ld [x%d/%.2f%s]",
-+					osvi.dwMajorVersion, osvi.dwMinorVersion, cpu_arch, 
- 					cpuspeed, cpuspeedstr);
- 	} else
+-					cpuspeed, cpuspeedstr);
+-	} else
 -		sprintf (verbuf, "Windows %ld.%ld [i%d86]",
 -			osvi.dwMajorVersion, osvi.dwMinorVersion, si.wProcessorLevel);
-+		sprintf (verbuf, "Windows %ld.%ld [x%d]",
-+			osvi.dwMajorVersion, osvi.dwMinorVersion, cpu_arch);
- 
+-
+		sprintf (verbuf, "Windows %s [%.2f%s]",	winver, cpuspeed, cpuspeedstr);
+	}
+	else
+	{
+		sprintf (verbuf, "Windows %s", winver);
+	}
+	
 	return verbuf;
 }
+ 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c
 --- xchat-wdk.orig/src/common/xchat.c	2008-06-08 09:58:58 +0200
-+++ xchat-wdk/src/common/xchat.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/xchat.c	2010-10-08 04:16:18 +0200
@@ -22,7 +22,6 @@
 #include <time.h>
 #include <sys/types.h>
@ -650,7 +736,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
 	"NAME LEAVE\n"			"CMD part &2\n\n"\
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
 --- xchat-wdk.orig/src/common/xchat.h	2010-08-07 09:14:45 +0200
-+++ xchat-wdk/src/common/xchat.h	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/common/xchat.h	2010-10-08 04:16:18 +0200
@@ -12,12 +12,14 @@
 
 #include "history.h"
@ -688,7 +774,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
 	unsigned int ctcp_time_limit;	/*seconds of floods */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe-gtk/about.c
 --- xchat-wdk.orig/src/fe-gtk/about.c	2010-05-16 09:43:49 +0200
-+++ xchat-wdk/src/fe-gtk/about.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/about.c	2010-10-09 11:11:53 +0200
@@ -39,6 +39,7 @@
 
 #include "../common/xchat.h"
@ -697,7 +783,27 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
 #include "palette.h"
 #include "pixmaps.h"
 #include "gtkutil.h"
-@@ -95,7 +96,7 @@
+@@ -87,6 +88,19 @@
+ 	char buf[512];
+ 	const char *locale = NULL;
+ 	extern GtkWindow *parent_window;      /* maingui.c */
+	SYSTEM_INFO si;
+	unsigned short int cpu_arch;
+
+	GetSystemInfo (&si);
+
+	if (si.wProcessorArchitecture == 9)
+	{
+		cpu_arch = 64;
+	}
+	else
+	{
+		cpu_arch = 86;
+	}
+ 
+ 	if (about)
+ 	{
+@@ -95,7 +109,7 @@
 	}
 
 	about = gtk_dialog_new ();
@ -706,7 +812,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
 	gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
 	gtk_window_set_title (GTK_WINDOW (about), _("About "DISPLAY_NAME));
 	if (parent_window)
-@@ -114,35 +115,38 @@
+@@ -114,35 +128,40 @@
 	g_get_charset (&locale);
 	(snprintf) (buf, sizeof (buf),
 				"<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n\n"
@ -715,13 +821,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
 -				/* leave this message to avoid time wasting bug reports! */
 -				"This version is unofficial and comes with no support.\n\n"
 -#endif
+-				"%s\n"
 +				"<b>XChat Base</b>: 2.8.8\n\n"
- 				"%s\n"
+				"<b>OS</b>: %s\n"
 				"<b>Charset</b>: %s "
 -#ifdef WIN32 
 				"<b>GTK+</b>: %i.%i.%i\n"
 +				"<b>Compiled</b>: "__DATE__"\n"
-+				"<b>Portable Mode</b>: %s\n\n"
+				"<b>Portable Mode</b>: %s\n"
+				"<b>Build Type</b>: x%d\n\n"
 +				"<small>This version is unofficial and comes with no support.\n"
 +				"\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org></small>",
 +				get_cpu_str (),
@ -729,7 +837,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
 +				gtk_major_version,
 +				gtk_minor_version,
 +				gtk_micro_version,
-+				(portable_mode () ? "Yes" : "No")
+				(portable_mode () ? "Yes" : "No"),
+				cpu_arch
 #else
 +				"%s\n\n"
 +				"%s\n"
@ -764,7 +873,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/fe-gtk/banlist.c
 --- xchat-wdk.orig/src/fe-gtk/banlist.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/banlist.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/banlist.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
@ -775,7 +884,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src/fe-gtk/chanlist.c
 --- xchat-wdk.orig/src/fe-gtk/chanlist.c	2008-02-24 04:46:02 +0100
-+++ xchat-wdk/src/fe-gtk/chanlist.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/chanlist.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
@ -786,7 +895,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanview-tabs.c xchat-wdk/src/fe-gtk/chanview-tabs.c
 --- xchat-wdk.orig/src/fe-gtk/chanview-tabs.c	2005-11-21 06:25:39 +0100
-+++ xchat-wdk/src/fe-gtk/chanview-tabs.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/chanview-tabs.c	2010-10-08 04:16:18 +0200
@@ -144,8 +144,8 @@
 		for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1)
 		{
@ -811,7 +920,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanview-tabs.c xchat-wd
 		gtk_adjustment_set_value (adj, new_value);
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src/fe-gtk/editlist.c
 --- xchat-wdk.orig/src/fe-gtk/editlist.c	2006-03-13 09:33:45 +0100
-+++ xchat-wdk/src/fe-gtk/editlist.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/editlist.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
@ -822,7 +931,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
 #include <sys/stat.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/fe-gtk/fe-gtk.c
 --- xchat-wdk.orig/src/fe-gtk/fe-gtk.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/fe-gtk/fe-gtk.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
@ -859,7 +968,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f
 	sess = find_dialog (serv_list->data, "(warnings)");
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/fe-gtk/fe-gtk.h
 --- xchat-wdk.orig/src/fe-gtk/fe-gtk.h	2010-05-30 08:31:29 +0200
-+++ xchat-wdk/src/fe-gtk/fe-gtk.h	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.h	2010-10-08 04:16:18 +0200
@@ -4,7 +4,7 @@
 /* If you're compiling this for Windows, your release is un-official
  * and not condoned. Please don't use the XChat name. Make up your
@ -871,7 +980,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/f
 #endif
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe-gtk/fkeys.c
 --- xchat-wdk.orig/src/fe-gtk/fkeys.c	2008-02-24 06:09:34 +0100
-+++ xchat-wdk/src/fe-gtk/fkeys.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/fkeys.c	2010-10-08 04:16:18 +0200
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
@ -882,7 +991,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe
 #include <ctype.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/fe-gtk/gtkutil.c
 --- xchat-wdk.orig/src/fe-gtk/gtkutil.c	2009-07-18 14:38:10 +0200
-+++ xchat-wdk/src/fe-gtk/gtkutil.c	2010-10-05 05:22:28 +0200
+++ xchat-wdk/src/fe-gtk/gtkutil.c	2010-10-08 04:16:18 +0200
@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include <sys/types.h>
@ -1170,7 +1279,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/
 		dialog = gtk_file_chooser_dialog_new (title, NULL,
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe-gtk/joind.c
 --- xchat-wdk.orig/src/fe-gtk/joind.c	2006-12-26 05:56:55 +0100
-+++ xchat-wdk/src/fe-gtk/joind.c	2010-10-05 03:55:27 +0200
+++ xchat-wdk/src/fe-gtk/joind.c	2010-10-08 04:16:18 +0200
@@ -9,7 +9,6 @@
 
 #include <sys/types.h>
@ -1181,7 +1290,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/fe-gtk/maingui.c
 --- xchat-wdk.orig/src/fe-gtk/maingui.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/maingui.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/maingui.c	2010-10-08 04:16:18 +0200
@@ -214,60 +214,10 @@
 	away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE);
 }
@ -1268,13 +1377,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
 		g_signal_connect (G_OBJECT (dialog), "response",
 								G_CALLBACK (mg_tab_close_cb), sess);
 -		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-+		if (prefs.tab_layout)
+		if (!prefs.tab_layout && prefs.tab_pos == 6)
 +		{
-+			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
 +		}
 +		else
 +		{
-+			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);		
+			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
 +		}
 		gtk_widget_show (dialog);
 	}
@ -1323,7 +1432,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
 }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-gtk/menu.c
 --- xchat-wdk.orig/src/fe-gtk/menu.c	2010-05-16 06:24:24 +0200
-+++ xchat-wdk/src/fe-gtk/menu.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/menu.c	2010-10-08 04:16:18 +0200
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <fcntl.h>
@ -1334,7 +1443,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
 #include <windows.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/fe-gtk/palette.c
 --- xchat-wdk.orig/src/fe-gtk/palette.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/palette.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/palette.c	2010-10-08 04:16:18 +0200
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
@ -1345,7 +1454,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
 #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c
 --- xchat-wdk.orig/src/fe-gtk/plugin-tray.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-10-08 04:16:18 +0200
@@ -1,8 +1,7 @@
 /* Copyright (C) 2006-2007 Peter Zelezny. */
 
@ -1472,7 +1581,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
 	return 1;       /* return 1 for success */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c
 --- xchat-wdk.orig/src/fe-gtk/plugingui.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/plugingui.c	2010-10-05 02:53:43 +0200
+++ xchat-wdk/src/fe-gtk/plugingui.c	2010-10-08 04:16:18 +0200
@@ -35,7 +35,7 @@
 #include "../common/xchat.h"
 #define PLUGIN_C
@ -1495,7 +1604,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/sr
 static void
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c
 --- xchat-wdk.orig/src/fe-gtk/rawlog.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/rawlog.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/rawlog.c	2010-10-08 04:16:18 +0200
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
@ -1506,7 +1615,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f
 #include "fe-gtk.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/fe-gtk/search.c
 --- xchat-wdk.orig/src/fe-gtk/search.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/search.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/search.c	2010-10-08 04:16:18 +0200
@@ -153,7 +153,7 @@
 								_("_Find"));
 	g_object_set_data (G_OBJECT (wid), "e", entry);
@ -1518,7 +1627,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/f
 }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/src/fe-gtk/servlistgui.c
 --- xchat-wdk.orig/src/fe-gtk/servlistgui.c	2010-08-07 09:14:45 +0200
-+++ xchat-wdk/src/fe-gtk/servlistgui.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/servlistgui.c	2010-10-08 04:16:18 +0200
@@ -1782,7 +1782,7 @@
 	gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
 	g_signal_connect (G_OBJECT (checkbutton_fav), "toggled",
@ -1530,7 +1639,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/
 	gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 3);
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c
 --- xchat-wdk.orig/src/fe-gtk/setup.c	2008-02-08 10:04:45 +0100
-+++ xchat-wdk/src/fe-gtk/setup.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/setup.c	2010-10-08 04:16:18 +0200
@@ -109,13 +109,13 @@
 					N_("Give each person on IRC a different color"),0,0},
 	{ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(indent_nicks),
@ -1584,34 +1693,22 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
 --- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c	2006-07-17 07:51:02 +0200
-+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-10-05 03:55:28 +0200
-@@ -31,6 +31,20 @@
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-10-08 04:16:18 +0200
+@@ -31,6 +31,8 @@
 /*#include "gtkspell-iso-codes.h"
 #include "sexy-marshal.h"*/
 
-+/* workaround for ssize_t in VS 
-+   from krb/include/win-mac.h */
-+#ifndef SSIZE_T_DEFINED
-+#ifdef ssize_t
-+#undef ssize_t
-+#endif
-+#ifdef _WIN64
-+typedef __int64          ssize_t;
-+#else
-+typedef _W64 int         ssize_t;
-+#endif
-+#define SSIZE_T_DEFINED
-+#endif
+#include "typedef.h"
 +
 /*
  * Bunch of poop to make enchant into a runtime dependency rather than a
  * compile-time dependency.  This makes it so I don't have to hear the
-@@ -134,12 +148,10 @@
+@@ -134,12 +136,10 @@
 	GModule *enchant;
 	gpointer funcptr;
 
 -	enchant = g_module_open("libenchant", 0);
-+	enchant = g_module_open("libenchant-1.dll", 0);
+	enchant = g_module_open("libenchant.dll", 0);
 	if (enchant == NULL)
 	{
 -		enchant = g_module_open("libenchant.so.1", 0);
@ -1623,7 +1720,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat
 	have_enchant = TRUE;
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c
 --- xchat-wdk.orig/src/fe-gtk/xtext.c	2008-08-29 13:24:17 +0200
-+++ xchat-wdk/src/fe-gtk/xtext.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-gtk/xtext.c	2010-10-08 04:16:18 +0200
@@ -42,7 +42,6 @@
 #include <ctype.h>
 #include <stdlib.h>
@ -1643,7 +1740,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe
 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src/fe-text/fe-text.c
 --- xchat-wdk.orig/src/fe-text/fe-text.c	2008-08-29 13:24:17 +0200
-+++ xchat-wdk/src/fe-text/fe-text.c	2010-10-05 03:55:28 +0200
+++ xchat-wdk/src/fe-text/fe-text.c	2010-10-08 04:16:18 +0200
@@ -22,9 +22,13 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 @ -1 +1 @@
 -2