Index: ext/libicpf/src/libicpf/callback.h =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/callback.h (.../callback.h) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/callback.h (.../callback.h) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -32,9 +32,9 @@ /// General function definition #ifdef _WIN32 - typedef void(__stdcall *PFNFUNC)(void); + typedef void(__stdcall *PFNFUNC)(void); #else - typedef void(*PFNFUNC)(void); + typedef void(*PFNFUNC)(void); #endif /// Helper structure for callback class Index: ext/libicpf/src/libicpf/circ_buffer.h =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/circ_buffer.h (.../circ_buffer.h) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/circ_buffer.h (.../circ_buffer.h) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -22,7 +22,7 @@ #include "libicpf.h" #include "gen_types.h" #ifndef _WIN32 - #include + #include #endif BEGIN_ICPF_NAMESPACE Index: ext/libicpf/src/libicpf/config_property.cpp =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/config_property.cpp (.../config_property.cpp) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/config_property.cpp (.../config_property.cpp) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -449,7 +449,7 @@ return m_paStrings->at(stIndex).c_str(); } else - return m_val.pszVal; + return m_val.pszVal; } /** Sets a signed number property value. @@ -528,7 +528,7 @@ return m_paSigneds->at(stIndex); } else - return m_val.llVal; + return m_val.llVal; } /** Sets an unsigned number property value. @@ -607,7 +607,7 @@ return m_paUnsigneds->at(stIndex); } else - return m_val.ullVal; + return m_val.ullVal; } /** Sets a bool property value. @@ -667,7 +667,7 @@ return m_paBools->at(stIndex); } else - return m_val.bVal; + return m_val.bVal; } /** Retrieves the property count for this property. Index: ext/libicpf/src/libicpf/crc32.cpp =================================================================== diff -u -N -r9890bb2c6c16222df2ab7535e073603d2e772aac -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/crc32.cpp (.../crc32.cpp) (revision 9890bb2c6c16222df2ab7535e073603d2e772aac) +++ ext/libicpf/src/libicpf/crc32.cpp (.../crc32.cpp) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -25,7 +25,7 @@ #include "exception.h" #include #ifndef _WIN32 - #include + #include #endif BEGIN_ICPF_NAMESPACE Index: ext/libicpf/src/libicpf/file.cpp =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/file.cpp (.../file.cpp) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/file.cpp (.../file.cpp) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -63,13 +63,13 @@ m_uiFlags(0), m_bLastOperation(false), m_bBuffered(false), - m_uiBufferSize(0), + m_uiBufferSize(0), m_pbyBuffer(NULL), m_uiCurrentPos(0), - m_uiDataCount(0), + m_uiDataCount(0), m_bRememberedState(false), m_bSerializing(0), - m_pbySerialBuffer(NULL), + m_pbySerialBuffer(NULL), m_uiSerialBufferSize(0), m_uiSerialBufferPos(0), m_uiDataBlockFlags(BF_NONE) @@ -173,7 +173,7 @@ m_uiFlags=uiFlags; // is this buffered ? - set_buffering((uiFlags & FA_BUFFERED) != 0, uiBufSize); + set_buffering((uiFlags & FA_BUFFERED) != 0, uiBufSize); } } @@ -287,7 +287,7 @@ { // reads must be done by packets uint_t uiCurrPos=0; // position in external buffer - while (uiCurrPos < ulSize) + while (uiCurrPos < ulSize) { // are there any data left ? if (m_uiDataCount == 0 || m_uiCurrentPos == m_uiDataCount) @@ -301,7 +301,7 @@ memcpy(((byte_t*)pBuffer)+uiCurrPos, m_pbyBuffer+m_uiCurrentPos, uiCount); // update positions - uiCurrPos+=uiCount; + uiCurrPos+=uiCount; m_uiCurrentPos+=uiCount; } @@ -745,7 +745,7 @@ void file::_clear_serialization() { // remove all the traces of serializing - delete [] m_pbySerialBuffer; + delete [] m_pbySerialBuffer; m_pbySerialBuffer=NULL; m_uiSerialBufferSize=0; m_uiSerialBufferPos=0; Index: ext/libicpf/src/libicpf/libicpf.cpp =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/libicpf.cpp (.../libicpf.cpp) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/libicpf.cpp (.../libicpf.cpp) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -22,10 +22,7 @@ #ifdef _WIN32 #include -BOOL APIENTRY DllMain( HANDLE /*hModule*/, - DWORD ul_reason_for_call, - LPVOID /*lpReserved*/ - ) +BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/) { switch (ul_reason_for_call) { @@ -37,7 +34,7 @@ default: break; } - return TRUE; + return TRUE; } #endif Index: ext/libicpf/src/libicpf/libicpf.h =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/libicpf.h (.../libicpf.h) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/libicpf.h (.../libicpf.h) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -50,34 +50,34 @@ // import/export macros #ifdef _WIN32 - #ifdef LIBICPF_EXPORTS - /** \brief Import/export macros - * - * These macros are being used throughout the whole code. They are meant to - * export symbols (if the LIBICPF_EXPORTS is defined) from this library - * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). - */ - #define LIBICPF_API __declspec(dllexport) - #define ICPFTEMPL_EXTERN - #else - /** \brief Import/export macros - * - * These macros are being used throughout the whole code. They are meant to - * export symbols (if the LIBICPF_EXPORTS is defined) from this library - * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). - */ - #define LIBICPF_API __declspec(dllimport) - #define ICPFTEMPL_EXTERN extern - #endif +#ifdef LIBICPF_EXPORTS + /** \brief Import/export macros + * + * These macros are being used throughout the whole code. They are meant to + * export symbols (if the LIBICPF_EXPORTS is defined) from this library + * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). + */ + #define LIBICPF_API __declspec(dllexport) + #define ICPFTEMPL_EXTERN #else - /** \brief Import/export macros - * - * These macros are being used throughout the whole code. They are meant to - * export symbols (if the LIBICPF_EXPORTS is defined) from this library - * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). - */ - #define LIBICPF_API + /** \brief Import/export macros + * + * These macros are being used throughout the whole code. They are meant to + * export symbols (if the LIBICPF_EXPORTS is defined) from this library + * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). + */ + #define LIBICPF_API __declspec(dllimport) + #define ICPFTEMPL_EXTERN extern #endif +#else + /** \brief Import/export macros + * + * These macros are being used throughout the whole code. They are meant to + * export symbols (if the LIBICPF_EXPORTS is defined) from this library + * (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps). + */ + #define LIBICPF_API +#endif /// Begins ch namespace #define BEGIN_ICPF_NAMESPACE namespace icpf { Index: ext/libicpf/src/libicpf/str_help.h =================================================================== diff -u -N -re31dc31ccf2010abee81ddc399d65b57e4803278 -re23fa343ecbb7479eff916bd2e52086864499b6c --- ext/libicpf/src/libicpf/str_help.h (.../str_help.h) (revision e31dc31ccf2010abee81ddc399d65b57e4803278) +++ ext/libicpf/src/libicpf/str_help.h (.../str_help.h) (revision e23fa343ecbb7479eff916bd2e52086864499b6c) @@ -29,10 +29,10 @@ // some cross-platform compatibility macros #ifndef _WIN32 - #define stricmp strcasecmp - #define wcsicmp wcscasecmp - #define strnicmp strncasecmp - #define wcsnicmp wcsncasecmp + #define stricmp strcasecmp + #define wcsicmp wcscasecmp + #define strnicmp strncasecmp + #define wcsnicmp wcsncasecmp #endif class LIBICPF_API string_tool