diff -ur sphinx-0.9.8.1.orig/configure sphinx-0.9.8.1/configure --- sphinx-0.9.8.1.orig/configure Wed Jul 9 22:29:17 2008 +++ sphinx-0.9.8.1/configure Tue Mar 10 15:27:07 2009 @@ -1847,12 +1847,12 @@ echo "$as_me:$LINENO: checking whether to compile debug version" >&5 echo $ECHO_N "checking whether to compile debug version... $ECHO_C" >&6 if test x$ac_cv_use_debug != xno; then - SPHINX_CFLAGS="-Wall -g -D_FILE_OFFSET_BITS=64" + SPHINX_CFLAGS="-g -D_FILE_OFFSET_BITS=64" SPHINX_INJECT_FLAGS="-D_FILE_OFFSET_BITS=64" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - SPHINX_CFLAGS="-Wall -g -D_FILE_OFFSET_BITS=64 -O3 -DNDEBUG" + SPHINX_CFLAGS="-g -D_FILE_OFFSET_BITS=64 -O3 -DNDEBUG" SPHINX_INJECT_FLAGS="-D_FILE_OFFSET_BITS=64 -DNDEBUG" echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 diff -ur sphinx-0.9.8.1.orig/api/libsphinxclient/sphinxclient.c sphinx-0.9.8.1/api/libsphinxclient/sphinxclient.c --- sphinx-0.9.8.1.orig/api/libsphinxclient/sphinxclient.c Tue Jul 15 21:30:36 2008 +++ sphinx-0.9.8.1/api/libsphinxclient/sphinxclient.c Tue Mar 10 21:46:22 2009 @@ -20,6 +20,9 @@ #include #include #include +#include +#include +#include #ifndef _WIN32 #include "sphinxclient_config.h" diff -ur sphinx-0.9.8.1.orig/src/sphinx.cpp sphinx-0.9.8.1/src/sphinx.cpp --- sphinx-0.9.8.1.orig/src/sphinx.cpp Wed Oct 8 23:27:18 2008 +++ sphinx-0.9.8.1/src/sphinx.cpp Tue Mar 10 21:26:00 2009 @@ -697,7 +697,7 @@ } if ( m_bMlock ) - if ( -1==mlock ( m_pData, m_iLength ) ) + if ( -1==mlock ( (char*)m_pData, m_iLength ) ) sWarning->SetSprintf ( "mlock() failed: %s", strerror(errno) ); #endif // USE_WINDOWS @@ -719,7 +719,7 @@ if ( !m_bMlock ) return true; - if ( mlock ( m_pData, m_iLength )!=-1 ) + if ( mlock ( (char*)m_pData, m_iLength )!=-1 ) return true; if ( sError.IsEmpty() ) @@ -742,7 +742,7 @@ #else if ( g_bHeadProcess ) { - int iRes = munmap ( m_pData, m_iLength ); + int iRes = munmap ( (char*)m_pData, m_iLength ); if ( iRes ) sphWarn ( "munmap() failed: %s", strerror(errno) ); } @@ -14376,12 +14376,12 @@ ///////////////////////////////////////////////////////////////////////////// template < typename T > T sphCRCWord ( const BYTE * pWord ); -template<> uint64_t sphCRCWord ( const BYTE * pWord ) { return sphFNV64 ( pWord ); } -template<> DWORD sphCRCWord ( const BYTE * pWord ) { return sphCRC32 ( pWord ); } +template<> uint64_t sphCRCWord ( const BYTE * pWord ) { return sphFNV64 ( pWord ); } +template<> DWORD sphCRCWord ( const BYTE * pWord ) { return sphCRC32 ( pWord ); } template < typename T > T sphCRCWord ( const BYTE * pWord, int iLen ); -template<> uint64_t sphCRCWord ( const BYTE * pWord, int iLen ) { return sphFNV64 ( pWord, iLen ); } -template<> DWORD sphCRCWord ( const BYTE * pWord, int iLen ) { return sphCRC32 ( pWord, iLen ); } +template<> uint64_t sphCRCWord ( const BYTE * pWord, int iLen ) { return sphFNV64 ( pWord, iLen ); } +template<> DWORD sphCRCWord ( const BYTE * pWord, int iLen ) { return sphCRC32 ( pWord, iLen ); } void CSphDictCRC::ApplyStemmers ( BYTE * pWord )