Index: ext/libicpf/src/libicpf/buffer.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/buffer.h	(.../buffer.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/buffer.h	(.../buffer.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,127 +1,127 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
-#ifndef __BUFFER_H__
-#define __BUFFER_H__
-
-#include "libicpf.h"
-#include "gen_types.h"
-
-BEGIN_ICPF_NAMESPACE
-
-template<class T>
-class buffer
-{
-public:
-/** \name Construction/destruction/operators */
-/**@{*/
-	buffer();
-	buffer(const T* pData, size_t stCount);
-	buffer(const buffer& rSrc);
-	~buffer();
-
-	buffer& operator=(const buffer& rSrc);
-	const T* operator T*() const; { return m_pData; };
-/**@}*/
-
-	size_t get_size() const { return m_stBufSize; };
-	void resize(size_t stNewSize);
-
-	size_t get_block_size() const { return m_stBlockSize; };
-	void set_block_size(size_t stBlockSize);
-
-	size_t get_max_unused() const { return m_stMaxUnused; };
-	size_t set_max_unused();
-
-protected:
-	T* m_pData;				///< Pointer to the data
-	size_t m_stBufSize;		///< Current buffer size
-	size_t m_stBlockSize;	///< Block size
-	size_t m_stMaxUnused;	///< Max count of unused items allowed
-};
-
-template<class T>
-buffer::buffer() :
-	m_pData(NULL),
-	m_stBufSize(0),
-	m_stBlockSize(1024),
-	m_stMaxUnused(1024)
-{
-}
-
-template<class T>
-buffer::buffer(const T* pData, size_t stCount) :
-	m_pData(NULL),
-	m_stBufSize(0),
-	m_stBlockSize(1024),
-	m_stMaxUnused(1024)
-{
-	resize(stCount);
-	memcpy(m_pData, pData, stCount*sizeof(T));
-}
-
-template<class T>
-buffer::buffer(const buffer& rSrc) :
-	m_pData((rSrc.m_stBufSize > 0) ? new T[rSrc.m_stBufSize] : NULL),
-	m_stBufSize(rSrc.m_stBufSize),
-	m_stBlockSize(rSrc.m_stBlockSize),
-	m_stMaxUnused(rSrc.m_stMaxUnused)
-{
-	assert(m_stBlockSize > 0);
-	if (m_pData)
-		memcpy(m_pData, pData, stCount*sizeof(T));
-}
-
-template<class T>
-buffer::~buffer()
-{
-	delete [] m_pData;
-}
-
-template<class T>
-buffer& buffer::operator=(const buffer& rSrc)
-{
-	if (this != &rSrc)
-	{
-		delete [] m_pData;
-
-		m_pData=((rSrc.m_stBufSize > 0) ? new T[rSrc.m_stBufSize] : NULL);
-		m_stBufSize=rSrc.m_stBufSize;
-		m_stBlockSize=rSrc.m_stBlockSize;
-		m_stMaxUnused=rSrc.m_stMaxUnused;
-
-	}
-
-	return *this;
-}
-
-template<class T>
-const T* operator T*() const; { return m_pData; };
-
-template<class T>
-void resize(size_t stNewSize);
-
-template<class T>
-void set_block_size(size_t stBlockSize);
-
-template<class T>
-size_t set_max_unused();
-
-END_ICPF_NAMESPACE
-
-#endif
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+#ifndef __BUFFER_H__
+#define __BUFFER_H__
+
+#include "libicpf.h"
+#include "gen_types.h"
+
+BEGIN_ICPF_NAMESPACE
+
+template<class T>
+class buffer
+{
+public:
+/** \name Construction/destruction/operators */
+/**@{*/
+	buffer();
+	buffer(const T* pData, size_t stCount);
+	buffer(const buffer& rSrc);
+	~buffer();
+
+	buffer& operator=(const buffer& rSrc);
+	const T* operator T*() const; { return m_pData; };
+/**@}*/
+
+	size_t get_size() const { return m_stBufSize; };
+	void resize(size_t stNewSize);
+
+	size_t get_block_size() const { return m_stBlockSize; };
+	void set_block_size(size_t stBlockSize);
+
+	size_t get_max_unused() const { return m_stMaxUnused; };
+	size_t set_max_unused();
+
+protected:
+	T* m_pData;				///< Pointer to the data
+	size_t m_stBufSize;		///< Current buffer size
+	size_t m_stBlockSize;	///< Block size
+	size_t m_stMaxUnused;	///< Max count of unused items allowed
+};
+
+template<class T>
+buffer::buffer() :
+	m_pData(NULL),
+	m_stBufSize(0),
+	m_stBlockSize(1024),
+	m_stMaxUnused(1024)
+{
+}
+
+template<class T>
+buffer::buffer(const T* pData, size_t stCount) :
+	m_pData(NULL),
+	m_stBufSize(0),
+	m_stBlockSize(1024),
+	m_stMaxUnused(1024)
+{
+	resize(stCount);
+	memcpy(m_pData, pData, stCount*sizeof(T));
+}
+
+template<class T>
+buffer::buffer(const buffer& rSrc) :
+	m_pData((rSrc.m_stBufSize > 0) ? new T[rSrc.m_stBufSize] : NULL),
+	m_stBufSize(rSrc.m_stBufSize),
+	m_stBlockSize(rSrc.m_stBlockSize),
+	m_stMaxUnused(rSrc.m_stMaxUnused)
+{
+	assert(m_stBlockSize > 0);
+	if (m_pData)
+		memcpy(m_pData, pData, stCount*sizeof(T));
+}
+
+template<class T>
+buffer::~buffer()
+{
+	delete [] m_pData;
+}
+
+template<class T>
+buffer& buffer::operator=(const buffer& rSrc)
+{
+	if (this != &rSrc)
+	{
+		delete [] m_pData;
+
+		m_pData=((rSrc.m_stBufSize > 0) ? new T[rSrc.m_stBufSize] : NULL);
+		m_stBufSize=rSrc.m_stBufSize;
+		m_stBlockSize=rSrc.m_stBlockSize;
+		m_stMaxUnused=rSrc.m_stMaxUnused;
+
+	}
+
+	return *this;
+}
+
+template<class T>
+const T* operator T*() const; { return m_pData; };
+
+template<class T>
+void resize(size_t stNewSize);
+
+template<class T>
+void set_block_size(size_t stBlockSize);
+
+template<class T>
+size_t set_max_unused();
+
+END_ICPF_NAMESPACE
+
+#endif
Index: ext/libicpf/src/libicpf/callback.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/callback.cpp	(.../callback.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/callback.cpp	(.../callback.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
  /** \file callback.cpp
  *  \brief File provides the implementation of callback classes.
  */
Index: ext/libicpf/src/libicpf/callback.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/callback.h	(.../callback.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/callback.h	(.../callback.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CALLBACK_H__
 #define __CALLBACK_H__
 
Index: ext/libicpf/src/libicpf/cfg.cpp
===================================================================
diff -u -r9934e5dc9613bf3246f7d4955d4dd7c07f0dd555 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg.cpp	(.../cfg.cpp)	(revision 9934e5dc9613bf3246f7d4955d4dd7c07f0dd555)
+++ ext/libicpf/src/libicpf/cfg.cpp	(.../cfg.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file cfg.cpp
  *  \brief A placeholder for config class definitions.
  *  \todo Modify the class to use file class as a file access layer.
@@ -205,8 +205,8 @@
 void config::read_from_buffer(const tchar_t* pszData, size_t stSize)
 {
 	m_lock.lock();
-	try
-	{
+	try
+	{
 		m_pCfgBase->read_from_buffer(pszData, stSize);
 
 		// and transform it to eatable form using registered properties
@@ -623,13 +623,13 @@
 	size_t stLen = 0;
 	const tchar_t* psz=m_pvProps->at(uiProp).get_string(stIndex);
 	if(psz)
-	{
-		stLen = _tcslen(psz);
-		if(stLen >= stBufferSize)
-			stLen = stBufferSize - 1;
-
-		_tcsncpy(pszBuffer, psz, stLen);
-	}
+	{
+		stLen = _tcslen(psz);
+		if(stLen >= stBufferSize)
+			stLen = stBufferSize - 1;
+
+		_tcsncpy(pszBuffer, psz, stLen);
+	}
 	pszBuffer[stLen] = _t('\0');
 	m_lock.unlock();
 	return pszBuffer;
Index: ext/libicpf/src/libicpf/cfg.h
===================================================================
diff -u -r148c011f46790e1f18f85db16b3f61f70cf54965 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg.h	(.../cfg.h)	(revision 148c011f46790e1f18f85db16b3f61f70cf54965)
+++ ext/libicpf/src/libicpf/cfg.h	(.../cfg.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CFG_H__
 #define __CFG_H__
 
Index: ext/libicpf/src/libicpf/cfg_ini.cpp
===================================================================
diff -u -r9934e5dc9613bf3246f7d4955d4dd7c07f0dd555 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg_ini.cpp	(.../cfg_ini.cpp)	(revision 9934e5dc9613bf3246f7d4955d4dd7c07f0dd555)
+++ ext/libicpf/src/libicpf/cfg_ini.cpp	(.../cfg_ini.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #include "cfg_ini.h"
 #include "exception.h"
 #include <string>
@@ -150,12 +150,12 @@
 			// there is a line [pszLast, pszCurrent)
 			stLineLen = pszCurrent - pszLast;
 			if(stLineLen)
-			{
-				if(stLineLen >= INI_BUFFER)
-					stLineLen = INI_BUFFER - 1;
-				_tcsncpy(pszLine, pszLast, stLineLen);
-				pszLine[stLineLen] = _t('\0');
-
+			{
+				if(stLineLen >= INI_BUFFER)
+					stLineLen = INI_BUFFER - 1;
+				_tcsncpy(pszLine, pszLast, stLineLen);
+				pszLine[stLineLen] = _t('\0');
+
 				if(bFirstLine)
 				{
 					bFirstLine = false;
@@ -165,13 +165,13 @@
 					else
 						parse_line(pszLine);
 				}
-				else
-				{
-					// process the line
+				else
+				{
+					// process the line
 					parse_line(pszLine);
-				}
-			}
-			pszLast = pszCurrent + 1;
+				}
+			}
+			pszLast = pszCurrent + 1;
 		}
 		++pszCurrent;
 	}
@@ -180,16 +180,16 @@
 		// there is a line [pszLast, pszCurrent)
 		stLineLen = pszCurrent - pszLast;
 		if(stLineLen)
-		{
-			if(stLineLen >= INI_BUFFER)
-				stLineLen = INI_BUFFER - 1;
-
-			_tcsncpy(pszLine, pszLast, stLineLen);
-			pszLine[stLineLen] = _t('\0');
-
-			// process the line
+		{
+			if(stLineLen >= INI_BUFFER)
+				stLineLen = INI_BUFFER - 1;
+
+			_tcsncpy(pszLine, pszLast, stLineLen);
+			pszLine[stLineLen] = _t('\0');
+
+			// process the line
 			parse_line(pszLine);
-		}
+		}
 	}
 
 	delete [] pszLine;
Index: ext/libicpf/src/libicpf/cfg_ini.h
===================================================================
diff -u -r9934e5dc9613bf3246f7d4955d4dd7c07f0dd555 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg_ini.h	(.../cfg_ini.h)	(revision 9934e5dc9613bf3246f7d4955d4dd7c07f0dd555)
+++ ext/libicpf/src/libicpf/cfg_ini.h	(.../cfg_ini.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CFGINI_H__
 #define __CFGINI_H__
 
Index: ext/libicpf/src/libicpf/cfg_xml.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg_xml.cpp	(.../cfg_xml.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/cfg_xml.cpp	(.../cfg_xml.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #include "cfg_xml.h"
 //#include <expat.h>
 #include "exception.h"
Index: ext/libicpf/src/libicpf/cfg_xml.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/cfg_xml.h	(.../cfg_xml.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/cfg_xml.h	(.../cfg_xml.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CFGXML_H__
 #define __CFGXML_H__
 
Index: ext/libicpf/src/libicpf/circ_buffer.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/circ_buffer.cpp	(.../circ_buffer.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/circ_buffer.cpp	(.../circ_buffer.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #include "circ_buffer.h"
 #include <stddef.h>
 #include <string.h>
Index: ext/libicpf/src/libicpf/circ_buffer.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/circ_buffer.h	(.../circ_buffer.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/circ_buffer.h	(.../circ_buffer.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CIRCULARBUFFER_H__
 #define __CIRCULARBUFFER_H__
 
Index: ext/libicpf/src/libicpf/config_base.h
===================================================================
diff -u -r9934e5dc9613bf3246f7d4955d4dd7c07f0dd555 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/config_base.h	(.../config_base.h)	(revision 9934e5dc9613bf3246f7d4955d4dd7c07f0dd555)
+++ ext/libicpf/src/libicpf/config_base.h	(.../config_base.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CONFIG_BASE_H__
 #define __CONFIG_BASE_H__
 
Index: ext/libicpf/src/libicpf/config_property.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/config_property.cpp	(.../config_property.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/config_property.cpp	(.../config_property.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #include "config_property.h"
 #include "exception.h"
 #include "err_codes.h"
@@ -339,7 +339,7 @@
 {
 	assert(pszString);
 	if(!pszString)
-		THROW(_t("Invalid argument"), GE_INVALIDARG, 0, 0);
+		THROW(_t("Invalid argument"), GE_INVALIDARG, 0, 0);
 
 	if (m_uiPropType & flag_array)
 	{
@@ -903,7 +903,7 @@
 {
 	assert(pszSrc);
 	if(!pszSrc)
-		THROW(_t("Invalid argument"), GE_INVALIDARG, 0, 0);
+		THROW(_t("Invalid argument"), GE_INVALIDARG, 0, 0);
 
 	return pszSrc[0] != _t('0');
 }
Index: ext/libicpf/src/libicpf/config_property.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/config_property.h	(.../config_property.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/config_property.h	(.../config_property.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CONFIGPROPERTY_H__
 #define __CONFIGPROPERTY_H__
 
Index: ext/libicpf/src/libicpf/conv.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/conv.cpp	(.../conv.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/conv.cpp	(.../conv.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #include "conv.h"
 #include <string.h>
 
Index: ext/libicpf/src/libicpf/conv.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/conv.h	(.../conv.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/conv.h	(.../conv.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __CONV_H__
 #define __CONV_H__
 
Index: ext/libicpf/src/libicpf/crc32.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/crc32.cpp	(.../crc32.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/crc32.cpp	(.../crc32.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file crc32.cpp
  *  \brief Contain implementation of a function counting crc32 checksum
  */
Index: ext/libicpf/src/libicpf/crc32.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/crc32.h	(.../crc32.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/crc32.h	(.../crc32.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 
 /** \file crc32.h
  *  \brief Contain function counting crc32 checksum
Index: ext/libicpf/src/libicpf/dmutex.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/dmutex.cpp	(.../dmutex.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/dmutex.cpp	(.../dmutex.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,38 +1,38 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file dmutex.cpp
  *  \brief Contains mutex class for thread safe access with debugging capabilities (implementation).
  *  \see The mutex class.
  */
-#include "dmutex.h"
-
-#ifdef ENABLE_MUTEX_DEBUGGING
-
-#include <assert.h>
-#include <stdio.h>
-
-#ifdef _WIN32
-	#include <windows.h>
-#endif
-
-BEGIN_ICPF_NAMESPACE
-
+#include "dmutex.h"
+
+#ifdef ENABLE_MUTEX_DEBUGGING
+
+#include <assert.h>
+#include <stdio.h>
+
+#ifdef _WIN32
+	#include <windows.h>
+#endif
+
+BEGIN_ICPF_NAMESPACE
+
 ///////////////////////////////////////////////////////////////
 // debuggable mutex
 
@@ -184,5 +184,5 @@
 }
 
 END_ICPF_NAMESPACE
-
-#endif
+
+#endif
Index: ext/libicpf/src/libicpf/dmutex.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/dmutex.h	(.../dmutex.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/dmutex.h	(.../dmutex.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,35 +1,35 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file dmutex.h
  *  \brief Contains mutex class for thread safe access with debugging capabilities.
  *  \see The mutex class.
  */
-#ifndef __DMUTEX_H__
-#define __DMUTEX_H__
-
+#ifndef __DMUTEX_H__
+#define __DMUTEX_H__
+
 #include "libicpf.h"
 #include "gen_types.h"
-#include "dumpctx.h"
-#include "mutex.h"
-
-#ifdef ENABLE_MUTEX_DEBUGGING
-
+#include "dumpctx.h"
+#include "mutex.h"
+
+#ifdef ENABLE_MUTEX_DEBUGGING
+
 BEGIN_ICPF_NAMESPACE
 
 /** \brief Class provides the locking and unlocking capabilities for use with threads.
@@ -69,7 +69,7 @@
 };
 
 END_ICPF_NAMESPACE
-
-#endif
-
-#endif
+
+#endif
+
+#endif
Index: ext/libicpf/src/libicpf/dumpctx.cpp
===================================================================
diff -u -re06b4c55cea63c808a60d6708341dca04ee39212 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/dumpctx.cpp	(.../dumpctx.cpp)	(revision e06b4c55cea63c808a60d6708341dca04ee39212)
+++ ext/libicpf/src/libicpf/dumpctx.cpp	(.../dumpctx.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file dumpctx.cpp
  *  \brief Contain implementation of class dumpctx - a debug helper class.
  */
Index: ext/libicpf/src/libicpf/dumpctx.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/dumpctx.h	(.../dumpctx.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/dumpctx.h	(.../dumpctx.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file dumpctx.h
  *  \brief Contain class dumpctx - a debug helper class.
  */
Index: ext/libicpf/src/libicpf/err_codes.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/err_codes.h	(.../err_codes.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/err_codes.h	(.../err_codes.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __ERR_CODES_H__
 #define __ERR_CODES_H__
 
Index: ext/libicpf/src/libicpf/exception.cpp
===================================================================
diff -u -re06b4c55cea63c808a60d6708341dca04ee39212 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/exception.cpp	(.../exception.cpp)	(revision e06b4c55cea63c808a60d6708341dca04ee39212)
+++ ext/libicpf/src/libicpf/exception.cpp	(.../exception.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file exception.cpp
  *  \brief Contain an implementation of an exception handling class.
  */
Index: ext/libicpf/src/libicpf/exception.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/exception.h	(.../exception.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/exception.h	(.../exception.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file exception.h
  *  \brief Contain an exception handling class.
  */
Index: ext/libicpf/src/libicpf/file.cpp
===================================================================
diff -u -r11ed3bb42c590253675ed5083ecce17d5b0273e9 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/file.cpp	(.../file.cpp)	(revision 11ed3bb42c590253675ed5083ecce17d5b0273e9)
+++ ext/libicpf/src/libicpf/file.cpp	(.../file.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file file.cpp
  *  \brief Contains file/serializer class */
 
Index: ext/libicpf/src/libicpf/file.h
===================================================================
diff -u -r11ed3bb42c590253675ed5083ecce17d5b0273e9 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/file.h	(.../file.h)	(revision 11ed3bb42c590253675ed5083ecce17d5b0273e9)
+++ ext/libicpf/src/libicpf/file.h	(.../file.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file file.h 
  *  \brief Contains system independent file/serializer class
  *  \todo Apply properly handling of the encryption/decryption stuff.
@@ -248,9 +248,9 @@
 	rFile.swrite(&stCount, sizeof(stCount));
 
 	for(size_t stIndex = 0; stIndex != stCount; ++stIndex)
-	{
-		rFile<<((const tchar_t*)arrStr.GetAt(stIndex));
-	}
+	{
+		rFile<<((const tchar_t*)arrStr.GetAt(stIndex));
+	}
 	return rFile;
 }
 #endif
@@ -290,10 +290,10 @@
 
 	CString str;
 	for(size_t stIndex = 0; stIndex != stCount; ++stIndex)
-	{
-		rFile >> (str);
-		arrStrings.Add(str);
-	}
+	{
+		rFile >> (str);
+		arrStrings.Add(str);
+	}
 	return rFile;
 }
 #endif
Index: ext/libicpf/src/libicpf/gen_types.h
===================================================================
diff -u -redeee6b70119bea287cbb96d1e5b729d32346387 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/gen_types.h	(.../gen_types.h)	(revision edeee6b70119bea287cbb96d1e5b729d32346387)
+++ ext/libicpf/src/libicpf/gen_types.h	(.../gen_types.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,341 +1,341 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
-/** \file gen_types.h
- *  \brief Contains some compile-time settings for the whole engine.
- */
-#ifndef __GENTYPES_H__
-#define __GENTYPES_H__
-
-#if defined(HAVE_CONFIG_H)
-	#include "config.h"
-#endif
-
-#ifdef HAVE_INTTYPES_H
-	#include <inttypes.h>
-#else
-	#include <stddef.h>
-#endif
-
-#if defined (_WIN32) || defined (_WIN64)
-	#include <tchar.h>
-#endif
-
-#include <string>
-
-// standard types and formats used throughout the library
-// exactly 1 byte
-/// Byte type (8bit unsigned int)
-typedef unsigned char 	byte_t;
-
-// chars
-/// 8bit signed char
-typedef char			char_t;
-/// 8bit unsigned char
-typedef unsigned char	uchar_t;
-
-// system/configuration dependent chars
-#if (defined(_WIN32) || defined(_WIN64)) && defined(_UNICODE)
-	/// System/configuration dependent character (either wide char or normal one)
-	typedef wchar_t		tchar_t;
-	typedef std::wstring tstring_t;
-	/// Macro to be appended to each text in code to be either composed of wide characters or normal ones
-	#define __t(text)	L##text
-	#define _t(text)	__t(text)
-	/// String formatting string - depending on configuration could display wide char string or normal one.
-	#define TSTRFMT		WSTRFMT
-	#define TCHRFMT		CHRFMT
-#else
-	// description as above
-	typedef char_t		tchar_t;
-	typedef std::string tstring_t;
-	#define _t(text)	text
-	#define TSTRFMT		STRFMT
-	#define TCHRFMT		CHRFMT
-#endif
-
-// 16-bit integers
-/// 16bit short integer
-typedef short			short_t;
-/// 16bit unsigned short integer
-typedef unsigned short	ushort_t;
-
-// 32-bit integers
-#ifdef _WIN32
-	#ifdef _WIN64
-		/// 32bit integer
-		typedef int			int_t;
-		/// 32bit integer
-		typedef long			long_t;
-		/// 32bit unsigned integer
-		typedef unsigned int	uint_t;
-		/// 32bit unsigned long
-		typedef unsigned long	ulong_t;
-	#else
-		/// 32bit integer
-		typedef int				int_t;
-		/// 32bit integer
-		typedef long			long_t;
-		/// 32bit unsigned integer
-		typedef unsigned int	uint_t;
-		/// 32bit unsigned integer
-		typedef unsigned long	ulong_t;
-	#endif
-#else
-	/// 32bit integer
-	typedef int					int_t;
-	/// 32bit integer
-	typedef int					long_t;
-	/// 32bit unsigned integer
-	typedef unsigned int		uint_t;
-	/// 32bit unsigned integer
-	typedef unsigned int		ulong_t;
-#endif
-
-// 64-bit integers;
-/// 64bit;
-typedef long long				longlong_t;
-/// 64bit unsigned long long
-typedef unsigned long long		ulonglong_t;
-/// 64bit long long
-typedef  longlong_t				ll_t;
-/// 64bit unsigned long long
-typedef  ulonglong_t			ull_t;
-
-// double and float
-/// Float type
-typedef float					float_t;
-/// Double type
-typedef double					double_t;
-
-// platform dependent integers (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-#ifdef _WIN32
-	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-//	typedef int				intptr_t;
-	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-	typedef intptr_t		longptr_t;
-	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-//	typedef unsigned int	uintptr_t;
-	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-	typedef uintptr_t		ulongptr_t;
-#else
-	// linux and other
-	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-//	typedef long				intptr_t;
-	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-	typedef intptr_t		longptr_t;
-	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-//	typedef unsigned long		uintptr_t;
-	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
-	typedef uintptr_t		ulongptr_t;
-#endif
-
-// pointer
-/// untyped pointer
-typedef void*				ptr_t;
-
-/// std::string or std::wstring dependent on _UNICODE macro
-#ifdef _UNICODE
-	#define tstring std::wstring
-#else
-	#define tstring std::string
-#endif
-
-// formatting-related macros
-// chars
-/// Printf-style format string for displaying char_t value (as char)
-#define CHARFMT		_t("%c")
-/// Printf-style format string for displaying uchar_t value (as char)
-#define UCHARFMT	CHARFMT
-
-// char related numbers (workaround for (u)chars - values are(should be) converted to (u)short_t)
-/// Printf-style format string for displaying char_t as a number (the number has to be converted to short_t)
-#define CFMT		_t("%hd")
-/// Printf-style format string for displaying char_t as a hexadecimal number (the number has to be converted to short_t)
-#define CXFMT		_t("0x%.2hx")
-/// Printf-style format string for displaying uchar_t as a number (the number has to be converted to ushort_t)
-#define UCFMT		_t("%hu")
-/// Printf-style format string for displaying uchar_t as a hexadecimal number (the number has to be converted to ushort_t)
-#define UCXFMT		CXFMT
-
-// numbers
-// 16-bit
-/// Printf-style format string for displaying short_t as a number
-#define SFMT		_t("%hd")
-/// Printf-style format string for displaying short_t as a hex number
-#define SXFMT		_t("0x%.4hx")
-/// Printf-style format string for displaying ushort_t as a number
-#define USFMT		_t("%hu")
-/// Printf-style format string for displaying ushort_t as a hex number
-#define USXFMT		SXFMT
-
-// 32-bit
-#ifdef _WIN32
-	/// Printf-style format string for displaying long_t
-	#define LFMT		_t("%ld")
-	/// Printf-style format string for displaying long_t as a hex number
-	#define LXFMT		_t("0x%.8lx")
-	/// Printf-style format string for displaying ulong_t
-	#define ULFMT		_t("%lu")
-#else
-	/// Printf-style format string for displaying long_t
-	#define LFMT		_t("%d")
-	/// Printf-style format string for displaying long_t as a hex number
-	#define LXFMT		_t("0x%.8x")
-	/// Printf-style format string for displaying ulong_t
-	#define ULFMT		_t("%u")
-#endif
-
-/// Printf-style format string for displaying int_t
-#define IFMT		LFMT
-/// Printf-style format string for displaying int_t as a hex number
-#define IXFMT		LXFMT
-/// Printf-style format string for displaying uint_t
-#define UIFMT		ULFMT
-/// Printf-style format string for displaying ulong_t as a hex number
-#define ULXFMT		LXFMT
-/// Printf-style format string for displaying uint_t as a hex number
-#define UIXFMT		ULXFMT
-
-// 64-bit & system dependent
-#ifdef _WIN32
-	/// Printf-style format string for displaying ulonglong_t as a number
-	#define ULLFMT		_t("%I64u")
-	/// Printf-style format string for displaying ulonglong_t as a hex number
-	#define ULLXFMT		_t("0x%.16I64x")
-	/// Printf-style format string for displaying longlong_t
-	#define LLFMT		_t("%I64d")
-	/// Printf-style format string for displaying longlong_t as a hex number
-	#define LLXFMT		ULLXFMT
-	
-	#ifdef _WIN64
-		/// Printf-style format string for displaying intptr_t
-		#define IPTRFMT		LLFMT
-		/// Printf-style format string for displaying longptr_t
-		#define LPTRFMT		LLFMT
-		/// Printf-style format string for displaying intptr_t as a hex number
-		#define IPTRXFMT	LLXFMT
-		/// Printf-style format string for displaying longptr_t as a hex number
-		#define LPTRXFMT	LLXFMT
-		/// Printf-style format string for displaying uintptr_t
-		#define UIPTRFMT	ULLFMT
-		/// Printf-style format string for displaying ulongptr_t
-		#define ULPTRFMT	ULLFMT
-		/// Printf-style format string for displaying uintptr_t as a hex number
-		#define UIPTRXFMT	ULLXFMT
-		/// Printf-style format string for displaying ulongptr_t as a hex number
-		#define ULPTRXFMT	ULLXFMT
-	#else
-		/// Printf-style format string for displaying intptr_t
-		#define IPTRFMT		LFMT
-		/// Printf-style format string for displaying longptr_t
-		#define LPTRFMT		LFMT
-		/// Printf-style format string for displaying intptr_t as a hex number
-		#define IPTRXFMT	LXFMT
-		/// Printf-style format string for displaying longptr_t as a hex number
-		#define LPTRXFMT	LXFMT
-		/// Printf-style format string for displaying uintptr_t
-		#define UIPTRFMT	ULFMT
-		/// Printf-style format string for displaying ulongptr_t
-		#define ULPTRFMT	ULFMT
-		/// Printf-style format string for displaying uintptr_t as a hex number
-		#define UIPTRXFMT	ULXFMT
-		/// Printf-style format string for displaying ulongptr_t as a hex number
-		#define ULPTRXFMT	ULXFMT
-	#endif
-#else
-	/// Printf-style format string for displaying ulonglong_t as a number
-	#define ULLFMT		_t("%llu")
-	/// Printf-style format string for displaying ulonglong_t as a hex number
-	#define ULLXFMT		_t("0x%.16llx")
-	/// Printf-style format string for displaying longlong_t
-	#define LLFMT		_t("%lld")
-	/// Printf-style format string for displaying longlong_t as a hex number
-	#define LLXFMT		ULLXFMT
-	
-	// FIXME: distinguish between linux 32-bit architecture and 64-bit architecture here
-	/// Printf-style format string for displaying intptr_t
-	#define IPTRFMT		_t("%ld")
-	/// Printf-style format string for displaying longptr_t
-	#define LPTRFMT		IPTRFMT
-	/// Printf-style format string for displaying intptr_t as a hex number
-	#define IPTRXFMT	_t("0x%.8lx")
-	/// Printf-style format string for displaying longptr_t as a hex number
-	#define LPTRXFMT	IPTRXFMT
-	/// Printf-style format string for displaying uintptr_t
-	#define UIPTRFMT	_t("%lu")
-	/// Printf-style format string for displaying ulongptr_t
-	#define ULPTRFMT	UIPTRFMT
-	/// Printf-style format string for displaying uintptr_t as a hex number
-	#define UIPTRXFMT	_t("0x%.8lx")
-	/// Printf-style format string for displaying ulongptr_t as a hex number
-	#define ULPTRXFMT	UIPTRXFMT
-#endif
-
-// double (not checked for linux)
-/// Printf-style format string for displaying float_t
-#define FLOATFMT	_t("%.2f")
-/// Printf-style format string for displaying double_t
-#define DOUBLEFMT	_t("%.2f")
-
-// strings
-
-// NOTE: below are the specifications for strings, however win32/64 specified the
-// formatting strings to be dependent on the function used - %s used in printf
-// formats an ascii string, while the same %s used in wprintf gives a wide string.
-// So, basically, those macros should be modified in some way - either by making
-// a dependence on _UNICODE define or by creating additional set of macros to be used
-// with wprintf() and use the current ones for printf().
-#if defined(_WIN32) || defined(_WIN64)
-	#ifdef _UNICODE
-		/// Printf-style format string for displaying ansi strings (char_t based strings)
-		#define STRFMT		_t("%S")
-		/// Printf-style format string for displaying ascii char
-		#define CHRFMT		_t("%C")
-		/// Printf-style format string for displaying wide strings (wchar_t based strings)
-		#define WSTRFMT		_t("%s")
-		/// Printf-style format string for displaying wide char
-		#define WCHRFMT		_t("%c")
-	#else
-		/// Printf-style format string for displaying ansi strings (char_t based strings)
-		#define STRFMT		_t("%s")
-		/// Printf-style format string for displaying ascii char
-		#define CHRFMT		_t("%c")
-		/// Printf-style format string for displaying wide strings (wchar_t based strings)
-		#define WSTRFMT		_t("%S")
-		/// Printf-style format string for displaying wide char
-		#define WCHRFMT		_t("%C")
-	#endif
-#else
-	/// Printf-style format string for displaying ansi strings (char_t based strings)
-	#define STRFMT		_t("%s")
-	/// Printf-style format string for displaying ascii char
-	#define CHRFMT		_t("%c")
-	/// Printf-style format string for displaying wide strings (wchar_t based strings)
-	#define WSTRFMT		_t("%ls")
-	/// Printf-style format string for displaying wide char (WARNING: untested)
-	#define WCHRFMT		_t("%lc")
-#endif
-
-// pointer
-/// Printf-style format string for displaying pointers
-#define PTRFMT		_t("%p")
-/// Printf-style format string for displaying pointers (with 0x prefix)
-#define PTRXFMT		_t("0x%p")
-
-#endif
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+/** \file gen_types.h
+ *  \brief Contains some compile-time settings for the whole engine.
+ */
+#ifndef __GENTYPES_H__
+#define __GENTYPES_H__
+
+#if defined(HAVE_CONFIG_H)
+	#include "config.h"
+#endif
+
+#ifdef HAVE_INTTYPES_H
+	#include <inttypes.h>
+#else
+	#include <stddef.h>
+#endif
+
+#if defined (_WIN32) || defined (_WIN64)
+	#include <tchar.h>
+#endif
+
+#include <string>
+
+// standard types and formats used throughout the library
+// exactly 1 byte
+/// Byte type (8bit unsigned int)
+typedef unsigned char 	byte_t;
+
+// chars
+/// 8bit signed char
+typedef char			char_t;
+/// 8bit unsigned char
+typedef unsigned char	uchar_t;
+
+// system/configuration dependent chars
+#if (defined(_WIN32) || defined(_WIN64)) && defined(_UNICODE)
+	/// System/configuration dependent character (either wide char or normal one)
+	typedef wchar_t		tchar_t;
+	typedef std::wstring tstring_t;
+	/// Macro to be appended to each text in code to be either composed of wide characters or normal ones
+	#define __t(text)	L##text
+	#define _t(text)	__t(text)
+	/// String formatting string - depending on configuration could display wide char string or normal one.
+	#define TSTRFMT		WSTRFMT
+	#define TCHRFMT		CHRFMT
+#else
+	// description as above
+	typedef char_t		tchar_t;
+	typedef std::string tstring_t;
+	#define _t(text)	text
+	#define TSTRFMT		STRFMT
+	#define TCHRFMT		CHRFMT
+#endif
+
+// 16-bit integers
+/// 16bit short integer
+typedef short			short_t;
+/// 16bit unsigned short integer
+typedef unsigned short	ushort_t;
+
+// 32-bit integers
+#ifdef _WIN32
+	#ifdef _WIN64
+		/// 32bit integer
+		typedef int			int_t;
+		/// 32bit integer
+		typedef long			long_t;
+		/// 32bit unsigned integer
+		typedef unsigned int	uint_t;
+		/// 32bit unsigned long
+		typedef unsigned long	ulong_t;
+	#else
+		/// 32bit integer
+		typedef int				int_t;
+		/// 32bit integer
+		typedef long			long_t;
+		/// 32bit unsigned integer
+		typedef unsigned int	uint_t;
+		/// 32bit unsigned integer
+		typedef unsigned long	ulong_t;
+	#endif
+#else
+	/// 32bit integer
+	typedef int					int_t;
+	/// 32bit integer
+	typedef int					long_t;
+	/// 32bit unsigned integer
+	typedef unsigned int		uint_t;
+	/// 32bit unsigned integer
+	typedef unsigned int		ulong_t;
+#endif
+
+// 64-bit integers;
+/// 64bit;
+typedef long long				longlong_t;
+/// 64bit unsigned long long
+typedef unsigned long long		ulonglong_t;
+/// 64bit long long
+typedef  longlong_t				ll_t;
+/// 64bit unsigned long long
+typedef  ulonglong_t			ull_t;
+
+// double and float
+/// Float type
+typedef float					float_t;
+/// Double type
+typedef double					double_t;
+
+// platform dependent integers (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+#ifdef _WIN32
+	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+//	typedef int				intptr_t;
+	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+	typedef intptr_t		longptr_t;
+	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+//	typedef unsigned int	uintptr_t;
+	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+	typedef uintptr_t		ulongptr_t;
+#else
+	// linux and other
+	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+//	typedef long				intptr_t;
+	/// platform-dependent size signed integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+	typedef intptr_t		longptr_t;
+	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+//	typedef unsigned long		uintptr_t;
+	/// platform-dependent size unsigned integer (32-bit on 32-bit platforms, 64-bit on 64-bit platforms)
+	typedef uintptr_t		ulongptr_t;
+#endif
+
+// pointer
+/// untyped pointer
+typedef void*				ptr_t;
+
+/// std::string or std::wstring dependent on _UNICODE macro
+#ifdef _UNICODE
+	#define tstring std::wstring
+#else
+	#define tstring std::string
+#endif
+
+// formatting-related macros
+// chars
+/// Printf-style format string for displaying char_t value (as char)
+#define CHARFMT		_t("%c")
+/// Printf-style format string for displaying uchar_t value (as char)
+#define UCHARFMT	CHARFMT
+
+// char related numbers (workaround for (u)chars - values are(should be) converted to (u)short_t)
+/// Printf-style format string for displaying char_t as a number (the number has to be converted to short_t)
+#define CFMT		_t("%hd")
+/// Printf-style format string for displaying char_t as a hexadecimal number (the number has to be converted to short_t)
+#define CXFMT		_t("0x%.2hx")
+/// Printf-style format string for displaying uchar_t as a number (the number has to be converted to ushort_t)
+#define UCFMT		_t("%hu")
+/// Printf-style format string for displaying uchar_t as a hexadecimal number (the number has to be converted to ushort_t)
+#define UCXFMT		CXFMT
+
+// numbers
+// 16-bit
+/// Printf-style format string for displaying short_t as a number
+#define SFMT		_t("%hd")
+/// Printf-style format string for displaying short_t as a hex number
+#define SXFMT		_t("0x%.4hx")
+/// Printf-style format string for displaying ushort_t as a number
+#define USFMT		_t("%hu")
+/// Printf-style format string for displaying ushort_t as a hex number
+#define USXFMT		SXFMT
+
+// 32-bit
+#ifdef _WIN32
+	/// Printf-style format string for displaying long_t
+	#define LFMT		_t("%ld")
+	/// Printf-style format string for displaying long_t as a hex number
+	#define LXFMT		_t("0x%.8lx")
+	/// Printf-style format string for displaying ulong_t
+	#define ULFMT		_t("%lu")
+#else
+	/// Printf-style format string for displaying long_t
+	#define LFMT		_t("%d")
+	/// Printf-style format string for displaying long_t as a hex number
+	#define LXFMT		_t("0x%.8x")
+	/// Printf-style format string for displaying ulong_t
+	#define ULFMT		_t("%u")
+#endif
+
+/// Printf-style format string for displaying int_t
+#define IFMT		LFMT
+/// Printf-style format string for displaying int_t as a hex number
+#define IXFMT		LXFMT
+/// Printf-style format string for displaying uint_t
+#define UIFMT		ULFMT
+/// Printf-style format string for displaying ulong_t as a hex number
+#define ULXFMT		LXFMT
+/// Printf-style format string for displaying uint_t as a hex number
+#define UIXFMT		ULXFMT
+
+// 64-bit & system dependent
+#ifdef _WIN32
+	/// Printf-style format string for displaying ulonglong_t as a number
+	#define ULLFMT		_t("%I64u")
+	/// Printf-style format string for displaying ulonglong_t as a hex number
+	#define ULLXFMT		_t("0x%.16I64x")
+	/// Printf-style format string for displaying longlong_t
+	#define LLFMT		_t("%I64d")
+	/// Printf-style format string for displaying longlong_t as a hex number
+	#define LLXFMT		ULLXFMT
+	
+	#ifdef _WIN64
+		/// Printf-style format string for displaying intptr_t
+		#define IPTRFMT		LLFMT
+		/// Printf-style format string for displaying longptr_t
+		#define LPTRFMT		LLFMT
+		/// Printf-style format string for displaying intptr_t as a hex number
+		#define IPTRXFMT	LLXFMT
+		/// Printf-style format string for displaying longptr_t as a hex number
+		#define LPTRXFMT	LLXFMT
+		/// Printf-style format string for displaying uintptr_t
+		#define UIPTRFMT	ULLFMT
+		/// Printf-style format string for displaying ulongptr_t
+		#define ULPTRFMT	ULLFMT
+		/// Printf-style format string for displaying uintptr_t as a hex number
+		#define UIPTRXFMT	ULLXFMT
+		/// Printf-style format string for displaying ulongptr_t as a hex number
+		#define ULPTRXFMT	ULLXFMT
+	#else
+		/// Printf-style format string for displaying intptr_t
+		#define IPTRFMT		LFMT
+		/// Printf-style format string for displaying longptr_t
+		#define LPTRFMT		LFMT
+		/// Printf-style format string for displaying intptr_t as a hex number
+		#define IPTRXFMT	LXFMT
+		/// Printf-style format string for displaying longptr_t as a hex number
+		#define LPTRXFMT	LXFMT
+		/// Printf-style format string for displaying uintptr_t
+		#define UIPTRFMT	ULFMT
+		/// Printf-style format string for displaying ulongptr_t
+		#define ULPTRFMT	ULFMT
+		/// Printf-style format string for displaying uintptr_t as a hex number
+		#define UIPTRXFMT	ULXFMT
+		/// Printf-style format string for displaying ulongptr_t as a hex number
+		#define ULPTRXFMT	ULXFMT
+	#endif
+#else
+	/// Printf-style format string for displaying ulonglong_t as a number
+	#define ULLFMT		_t("%llu")
+	/// Printf-style format string for displaying ulonglong_t as a hex number
+	#define ULLXFMT		_t("0x%.16llx")
+	/// Printf-style format string for displaying longlong_t
+	#define LLFMT		_t("%lld")
+	/// Printf-style format string for displaying longlong_t as a hex number
+	#define LLXFMT		ULLXFMT
+	
+	// FIXME: distinguish between linux 32-bit architecture and 64-bit architecture here
+	/// Printf-style format string for displaying intptr_t
+	#define IPTRFMT		_t("%ld")
+	/// Printf-style format string for displaying longptr_t
+	#define LPTRFMT		IPTRFMT
+	/// Printf-style format string for displaying intptr_t as a hex number
+	#define IPTRXFMT	_t("0x%.8lx")
+	/// Printf-style format string for displaying longptr_t as a hex number
+	#define LPTRXFMT	IPTRXFMT
+	/// Printf-style format string for displaying uintptr_t
+	#define UIPTRFMT	_t("%lu")
+	/// Printf-style format string for displaying ulongptr_t
+	#define ULPTRFMT	UIPTRFMT
+	/// Printf-style format string for displaying uintptr_t as a hex number
+	#define UIPTRXFMT	_t("0x%.8lx")
+	/// Printf-style format string for displaying ulongptr_t as a hex number
+	#define ULPTRXFMT	UIPTRXFMT
+#endif
+
+// double (not checked for linux)
+/// Printf-style format string for displaying float_t
+#define FLOATFMT	_t("%.2f")
+/// Printf-style format string for displaying double_t
+#define DOUBLEFMT	_t("%.2f")
+
+// strings
+
+// NOTE: below are the specifications for strings, however win32/64 specified the
+// formatting strings to be dependent on the function used - %s used in printf
+// formats an ascii string, while the same %s used in wprintf gives a wide string.
+// So, basically, those macros should be modified in some way - either by making
+// a dependence on _UNICODE define or by creating additional set of macros to be used
+// with wprintf() and use the current ones for printf().
+#if defined(_WIN32) || defined(_WIN64)
+	#ifdef _UNICODE
+		/// Printf-style format string for displaying ansi strings (char_t based strings)
+		#define STRFMT		_t("%S")
+		/// Printf-style format string for displaying ascii char
+		#define CHRFMT		_t("%C")
+		/// Printf-style format string for displaying wide strings (wchar_t based strings)
+		#define WSTRFMT		_t("%s")
+		/// Printf-style format string for displaying wide char
+		#define WCHRFMT		_t("%c")
+	#else
+		/// Printf-style format string for displaying ansi strings (char_t based strings)
+		#define STRFMT		_t("%s")
+		/// Printf-style format string for displaying ascii char
+		#define CHRFMT		_t("%c")
+		/// Printf-style format string for displaying wide strings (wchar_t based strings)
+		#define WSTRFMT		_t("%S")
+		/// Printf-style format string for displaying wide char
+		#define WCHRFMT		_t("%C")
+	#endif
+#else
+	/// Printf-style format string for displaying ansi strings (char_t based strings)
+	#define STRFMT		_t("%s")
+	/// Printf-style format string for displaying ascii char
+	#define CHRFMT		_t("%c")
+	/// Printf-style format string for displaying wide strings (wchar_t based strings)
+	#define WSTRFMT		_t("%ls")
+	/// Printf-style format string for displaying wide char (WARNING: untested)
+	#define WCHRFMT		_t("%lc")
+#endif
+
+// pointer
+/// Printf-style format string for displaying pointers
+#define PTRFMT		_t("%p")
+/// Printf-style format string for displaying pointers (with 0x prefix)
+#define PTRXFMT		_t("0x%p")
+
+#endif
Index: ext/libicpf/src/libicpf/interface.h
===================================================================
diff -u -r9a885b0cc0f4f80418997812fd8df255cba22a5b -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/interface.h	(.../interface.h)	(revision 9a885b0cc0f4f80418997812fd8df255cba22a5b)
+++ ext/libicpf/src/libicpf/interface.h	(.../interface.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,34 +1,34 @@
-/***************************************************************************
- *   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
- *   ixen@copyhandler.com                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Library General Public License          *
- *   (version 2) as published by the Free Software Foundation;             *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#ifndef __INTERFACE_H__
-#define __INTERFACE_H__
-
-#include "libicpf.h"
-
-BEGIN_ICPF_NAMESPACE
-
-class IInterface
-{
-public:
-	virtual void Delete() = 0;
-};
-
-END_ICPF_NAMESPACE
-
+/***************************************************************************
+ *   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+ *   ixen@copyhandler.com                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Library General Public License          *
+ *   (version 2) as published by the Free Software Foundation;             *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this program; if not, write to the                 *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef __INTERFACE_H__
+#define __INTERFACE_H__
+
+#include "libicpf.h"
+
+BEGIN_ICPF_NAMESPACE
+
+class IInterface
+{
+public:
+	virtual void Delete() = 0;
+};
+
+END_ICPF_NAMESPACE
+
 #endif
\ No newline at end of file
Index: ext/libicpf/src/libicpf/libicpf.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/libicpf.cpp	(.../libicpf.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/libicpf.cpp	(.../libicpf.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 // libicpf.cpp : Defines the entry point for the DLL application.
 //
 
Index: ext/libicpf/src/libicpf/libicpf.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/libicpf.h	(.../libicpf.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/libicpf.h	(.../libicpf.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __LIBICPF_H__
 #define __LIBICPF_H__
 
Index: ext/libicpf/src/libicpf/log.cpp
===================================================================
diff -u -re06b4c55cea63c808a60d6708341dca04ee39212 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/log.cpp	(.../log.cpp)	(revision e06b4c55cea63c808a60d6708341dca04ee39212)
+++ ext/libicpf/src/libicpf/log.cpp	(.../log.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file log.cpp
  *  \brief Contains the implamentation of a log class.
  */
Index: ext/libicpf/src/libicpf/log.h
===================================================================
diff -u -re06b4c55cea63c808a60d6708341dca04ee39212 -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/log.h	(.../log.h)	(revision e06b4c55cea63c808a60d6708341dca04ee39212)
+++ ext/libicpf/src/libicpf/log.h	(.../log.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file log.h
  *  \brief Contains the log class.
  */
Index: ext/libicpf/src/libicpf/macros.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/macros.h	(.../macros.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/macros.h	(.../macros.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __MACROS_H__
 #define __MACROS_H__
 
Index: ext/libicpf/src/libicpf/module.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/module.cpp	(.../module.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/module.cpp	(.../module.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 ///** \file module.cpp
 // *  \brief File contain an implementation of the module (and related) classes.
 // */
Index: ext/libicpf/src/libicpf/module.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/module.h	(.../module.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/module.h	(.../module.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file module.h
  *  \brief File contain declaration of the module (and related) classes.
  */
Index: ext/libicpf/src/libicpf/mutex.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/mutex.cpp	(.../mutex.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/mutex.cpp	(.../mutex.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,25 +1,25 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
-#include "mutex.h"
-
-BEGIN_ICPF_NAMESPACE
-
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+#include "mutex.h"
+
+BEGIN_ICPF_NAMESPACE
+
 mutex::mutex()
 {
 #ifdef _WIN32
Index: ext/libicpf/src/libicpf/mutex.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/mutex.h	(.../mutex.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/mutex.h	(.../mutex.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file mutex.h
  *  \brief Contains mutex class for thread safe access.
  */
Index: ext/libicpf/src/libicpf/str_help.cpp
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/str_help.cpp	(.../str_help.cpp)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/str_help.cpp	(.../str_help.cpp)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file str_help.cpp
  *  \brief Contain implementation of some string helper functions.
  */
Index: ext/libicpf/src/libicpf/str_help.h
===================================================================
diff -u -r3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f -re31dc31ccf2010abee81ddc399d65b57e4803278
--- ext/libicpf/src/libicpf/str_help.h	(.../str_help.h)	(revision 3150d0c0a9a5fe75a5954e17a5a445a14e0bea1f)
+++ ext/libicpf/src/libicpf/str_help.h	(.../str_help.h)	(revision e31dc31ccf2010abee81ddc399d65b57e4803278)
@@ -1,21 +1,21 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 /** \file str_help.h
  *  \brief Contain some string helper functions.
  */