From: Michal Čihař Subject: Fixes compilation with recent GCC which is more strict about C++. Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2125955&group_id=122858&atid=694730 --- a/src/readline.cpp +++ b/src/readline.cpp @@ -23,6 +23,7 @@ #endif #include +#include #ifdef WITH_READLINE # include # include --- a/src/libwrapper.cpp +++ b/src/libwrapper.cpp @@ -24,6 +24,7 @@ #include #include +#include #include "utils.hpp" --- a/src/utils.cpp +++ b/src/utils.cpp @@ -22,6 +22,8 @@ # include "config.h" #endif +#include +#include #include #include --- a/src/lib/lib.cpp +++ b/src/lib/lib.cpp @@ -513,7 +513,7 @@ { fseek(idxfile, wordoffset[page_idx], SEEK_SET); guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx]; - fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. + fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. return wordentry_buf; }