tag 455652 patch
stop
On Dec 11, 2007 12:56 PM, Jean-Francois Dockes
<[EMAIL PROTECTED]> wrote:
> Ah, ok, thank you if you can fix it, else, I'll do it later.
Hi,
Here is patch. Not much intelligent, but works :)
--
Cheers,
--------------------------------------------------
Kartik Mistry | 0xD1028C8D | IRC: kart_
kartikm.wordpress.com | blog.ftbfs.in
--------------------------------------------------
diff -ur recoll-1.10.0-orig/aspell/rclaspell.cpp recoll-1.10.0/aspell/rclaspell.cpp
--- recoll-1.10.0-orig/aspell/rclaspell.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/aspell/rclaspell.cpp 2007-12-11 15:00:38.000000000 +0530
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <dlfcn.h>
#include <iostream>
-
+#include <stdlib.h>
#include <vector>
#include ASPELL_INCLUDE
diff -ur recoll-1.10.0-orig/bincimapmime/convert.h recoll-1.10.0/bincimapmime/convert.h
--- recoll-1.10.0-orig/bincimapmime/convert.h 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/bincimapmime/convert.h 2007-12-11 17:43:59.000000000 +0530
@@ -36,6 +36,8 @@
#include <stdio.h>
#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
#include "address.h"
//#include "depot.h"
diff -ur recoll-1.10.0-orig/common/rclconfig.cpp recoll-1.10.0/common/rclconfig.cpp
--- recoll-1.10.0-orig/common/rclconfig.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/common/rclconfig.cpp 2007-12-11 15:02:20.000000000 +0530
@@ -33,6 +33,8 @@
#endif
#include <iostream>
+#include <stdlib.h>
+#include <cstring>
#include "pathut.h"
#include "rclconfig.h"
diff -ur recoll-1.10.0-orig/common/rclinit.cpp recoll-1.10.0/common/rclinit.cpp
--- recoll-1.10.0-orig/common/rclinit.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/common/rclinit.cpp 2007-12-11 15:04:06.000000000 +0530
@@ -22,6 +22,7 @@
#include <signal.h>
#include <locale.h>
#include <pthread.h>
+#include <stdlib.h>
#include "debuglog.h"
#include "rclconfig.h"
diff -ur recoll-1.10.0-orig/common/textsplit.cpp recoll-1.10.0/common/textsplit.cpp
--- recoll-1.10.0-orig/common/textsplit.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/common/textsplit.cpp 2007-12-11 15:05:35.000000000 +0530
@@ -22,6 +22,8 @@
#include <iostream>
#include <string>
#include <set>
+#include <string.h>
+
#include "textsplit.h"
#include "debuglog.h"
#include "assert.h"
diff -ur recoll-1.10.0-orig/common/unacpp.cpp recoll-1.10.0/common/unacpp.cpp
--- recoll-1.10.0-orig/common/unacpp.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/common/unacpp.cpp 2007-12-11 15:07:47.000000000 +0530
@@ -20,7 +20,7 @@
#ifndef TEST_UNACPP
#include <stdio.h>
-
+#include <cstdlib>
#include <errno.h>
#include <string>
diff -ur recoll-1.10.0-orig/index/csguess.cpp recoll-1.10.0/index/csguess.cpp
--- recoll-1.10.0-orig/index/csguess.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/index/csguess.cpp 2007-12-11 15:09:43.000000000 +0530
@@ -40,8 +40,7 @@
* *********************************************************/
#include <errno.h>
-
-#include <string>
+#include <string.h>
#include <iostream>
#ifndef NO_NAMESPACES
diff -ur recoll-1.10.0-orig/index/indexer.cpp recoll-1.10.0/index/indexer.cpp
--- recoll-1.10.0-orig/index/indexer.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/index/indexer.cpp 2007-12-11 15:13:21.000000000 +0530
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
-#include <strings.h>
+#include <string.h>
#include <fnmatch.h>
#include <iostream>
diff -ur recoll-1.10.0-orig/index/rclmonprc.cpp recoll-1.10.0/index/rclmonprc.cpp
--- recoll-1.10.0-orig/index/rclmonprc.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/index/rclmonprc.cpp 2007-12-11 17:47:13.000000000 +0530
@@ -32,6 +32,8 @@
#include <unistd.h>
#include <errno.h>
#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
#include "debuglog.h"
#include "rclmon.h"
diff -ur recoll-1.10.0-orig/index/rclmonrcv.cpp recoll-1.10.0/index/rclmonrcv.cpp
--- recoll-1.10.0-orig/index/rclmonrcv.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/index/rclmonrcv.cpp 2007-12-11 17:46:32.000000000 +0530
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <errno.h>
+#include <string.h>
#include "debuglog.h"
#include "rclmon.h"
diff -ur recoll-1.10.0-orig/index/recollindex.cpp recoll-1.10.0/index/recollindex.cpp
--- recoll-1.10.0-orig/index/recollindex.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/index/recollindex.cpp 2007-12-11 17:44:55.000000000 +0530
@@ -28,6 +28,7 @@
#include <iostream>
#include <list>
#include <string>
+#include <stdlib.h>
using namespace std;
diff -ur recoll-1.10.0-orig/internfile/htmlparse.cpp recoll-1.10.0/internfile/htmlparse.cpp
--- recoll-1.10.0-orig/internfile/htmlparse.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/internfile/htmlparse.cpp 2007-12-11 15:14:26.000000000 +0530
@@ -32,6 +32,7 @@
#include "htmlparse.h"
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
map<string, unsigned int> HtmlParser::named_ents;
diff -ur recoll-1.10.0-orig/internfile/mh_mail.cpp recoll-1.10.0/internfile/mh_mail.cpp
--- recoll-1.10.0-orig/internfile/mh_mail.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/internfile/mh_mail.cpp 2007-12-11 15:19:54.000000000 +0530
@@ -23,6 +23,7 @@
#include <errno.h>
#include <unistd.h>
#include <time.h>
+#include <cstdlib>
#include <map>
#include <sstream>
diff -ur recoll-1.10.0-orig/internfile/mh_mbox.cpp recoll-1.10.0/internfile/mh_mbox.cpp
--- recoll-1.10.0-orig/internfile/mh_mbox.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/internfile/mh_mbox.cpp 2007-12-11 15:20:56.000000000 +0530
@@ -24,6 +24,7 @@
#include <unistd.h>
#include <time.h>
#include <regex.h>
+#include <string.h>
#include <map>
#include <sstream>
diff -ur recoll-1.10.0-orig/internfile/myhtmlparse.cpp recoll-1.10.0/internfile/myhtmlparse.cpp
--- recoll-1.10.0-orig/internfile/myhtmlparse.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/internfile/myhtmlparse.cpp 2007-12-11 15:18:35.000000000 +0530
@@ -24,6 +24,8 @@
*/
#include <time.h>
#include <stdio.h>
+#include <algorithm>
+#include <string.h>
#include "myhtmlparse.h"
#include "indextext.h" // for lowercase_term()
diff -ur recoll-1.10.0-orig/query/docseqhist.cpp recoll-1.10.0/query/docseqhist.cpp
--- recoll-1.10.0-orig/query/docseqhist.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/query/docseqhist.cpp 2007-12-11 15:50:25.000000000 +0530
@@ -19,6 +19,7 @@
*/
#include <math.h>
#include <time.h>
+#include <cmath>
#include "docseqhist.h"
#include "rcldb.h"
@@ -48,7 +49,7 @@
if (percent)
*percent = 100;
if (sh) {
- if (m_prevtime < 0 || abs(m_prevtime - m_it->unixtime) > 86400) {
+ if (m_prevtime < 0 || abs (float(m_prevtime) - float(m_it->unixtime)) > 86400) {
m_prevtime = m_it->unixtime;
time_t t = (time_t)(m_it->unixtime);
*sh = string(ctime(&t));
diff -ur recoll-1.10.0-orig/query/history.cpp recoll-1.10.0/query/history.cpp
--- recoll-1.10.0-orig/query/history.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/query/history.cpp 2007-12-11 15:51:24.000000000 +0530
@@ -21,6 +21,7 @@
#ifndef TEST_HISTORY
#include <stdio.h>
#include <time.h>
+#include <cstdlib>
#include "history.h"
#include "base64.h"
diff -ur recoll-1.10.0-orig/query/recollq.cpp recoll-1.10.0/query/recollq.cpp
--- recoll-1.10.0-orig/query/recollq.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/query/recollq.cpp 2007-12-11 16:13:50.000000000 +0530
@@ -26,6 +26,7 @@
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
+#include <limits.h>
#include <iostream>
using namespace std;
diff -ur recoll-1.10.0-orig/rcldb/pathhash.cpp recoll-1.10.0/rcldb/pathhash.cpp
--- recoll-1.10.0-orig/rcldb/pathhash.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/rcldb/pathhash.cpp 2007-12-11 17:20:05.000000000 +0530
@@ -19,6 +19,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include "pathhash.h"
#include "md5.h"
diff -ur recoll-1.10.0-orig/rcldb/rcldb.cpp recoll-1.10.0/rcldb/rcldb.cpp
--- recoll-1.10.0-orig/rcldb/rcldb.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/rcldb/rcldb.cpp 2007-12-11 17:24:29.000000000 +0530
@@ -18,6 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
+#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fnmatch.h>
diff -ur recoll-1.10.0-orig/utils/base64.cpp recoll-1.10.0/utils/base64.cpp
--- recoll-1.10.0-orig/utils/base64.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/base64.cpp 2007-12-11 17:30:52.000000000 +0530
@@ -19,8 +19,9 @@
*/
#include <sys/types.h>
-
+#include <cstring>
#include <string>
+
#ifndef NO_NAMESPACES
using std::string;
#endif /* NO_NAMESPACES */
diff -ur recoll-1.10.0-orig/utils/conftree.cpp recoll-1.10.0/utils/conftree.cpp
--- recoll-1.10.0-orig/utils/conftree.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/conftree.cpp 2007-12-11 17:32:07.000000000 +0530
@@ -30,6 +30,7 @@
#include <sstream>
#include <algorithm>
#include <iostream>
+#include <string.h>
#include "conftree.h"
#include "pathut.h"
diff -ur recoll-1.10.0-orig/utils/copyfile.cpp recoll-1.10.0/utils/copyfile.cpp
--- recoll-1.10.0-orig/utils/copyfile.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/copyfile.cpp 2007-12-11 17:32:53.000000000 +0530
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
+#include <string.h>
#include <string>
using std::string;
diff -ur recoll-1.10.0-orig/utils/fstreewalk.cpp recoll-1.10.0/utils/fstreewalk.cpp
--- recoll-1.10.0-orig/utils/fstreewalk.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/fstreewalk.cpp 2007-12-11 17:34:52.000000000 +0530
@@ -24,6 +24,8 @@
#include <sys/stat.h>
#include <errno.h>
#include <fnmatch.h>
+#include <string.h>
+#include <algorithm>
#include <sstream>
#include <list>
diff -ur recoll-1.10.0-orig/utils/idfile.cpp recoll-1.10.0/utils/idfile.cpp
--- recoll-1.10.0-orig/utils/idfile.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/idfile.cpp 2007-12-11 17:35:34.000000000 +0530
@@ -20,6 +20,7 @@
#ifndef TEST_IDFILE
#include <unistd.h> // for access(2)
#include <ctype.h>
+#include <string.h>
#include <fstream>
#include <sstream>
diff -ur recoll-1.10.0-orig/utils/mimeparse.cpp recoll-1.10.0/utils/mimeparse.cpp
--- recoll-1.10.0-orig/utils/mimeparse.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/mimeparse.cpp 2007-12-11 17:36:52.000000000 +0530
@@ -27,6 +27,8 @@
#include <stdio.h>
#include <ctype.h>
#include <time.h>
+#include <stdlib.h>
+#include <string.h>
#include "mimeparse.h"
#include "base64.h"
diff -ur recoll-1.10.0-orig/utils/pathut.cpp recoll-1.10.0/utils/pathut.cpp
--- recoll-1.10.0-orig/utils/pathut.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/pathut.cpp 2007-12-11 17:40:12.000000000 +0530
@@ -24,6 +24,8 @@
#include <sys/param.h>
#include <pwd.h>
#include <math.h>
+#include <stdlib.h>
+#include <string.h>
#include <iostream>
#include <list>
diff -ur recoll-1.10.0-orig/utils/readfile.cpp recoll-1.10.0/utils/readfile.cpp
--- recoll-1.10.0-orig/utils/readfile.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/readfile.cpp 2007-12-11 17:41:26.000000000 +0530
@@ -24,6 +24,7 @@
#define O_STREAMING 0
#endif
#include <errno.h>
+#include <string.h>
#include <string>
#ifndef NO_NAMESPACES
diff -ur recoll-1.10.0-orig/utils/wipedir.cpp recoll-1.10.0/utils/wipedir.cpp
--- recoll-1.10.0-orig/utils/wipedir.cpp 2007-12-11 14:58:21.000000000 +0530
+++ recoll-1.10.0/utils/wipedir.cpp 2007-12-11 17:42:01.000000000 +0530
@@ -25,6 +25,7 @@
#include <sys/stat.h>
#include <errno.h>
+#include <string.h>
#include <string>
#ifndef NO_NAMESPACES
using namespace std;
