From 197514bbbf1137634e894e9cae8931eedc48b6a3 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Tue, 2 May 2006 09:49:06 +0000
Subject: [PATCH] more fbsd4 tweaks: Release 1.4.2

---
 src/qtgui/guiutils.cpp | 11 +++++++----
 src/rcldb/stemdb.cpp   |  8 +++++++-
 src/unac/unac.c        |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp
index fde07e33..684e0b6e 100644
--- a/src/qtgui/guiutils.cpp
+++ b/src/qtgui/guiutils.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Exp $ (C) 2005 Jean-Francois Dockes";
+static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.11 2006-05-02 09:49:06 dockes Exp $ (C) 2005 Jean-Francois Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,8 @@ static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Ex
  */
 #include <unistd.h>
 
+#include <algorithm>
+
 #include "debuglog.h"
 #include "smallut.h"
 #include "recoll.h"
@@ -30,7 +32,7 @@ static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.10 2006-04-27 09:23:10 dockes Ex
 #include <qsettings.h>
 #include <qstringlist.h>
 
-const static char *htmlbrowserlist = 
+static const char *htmlbrowserlist = 
     "opera konqueror firefox mozilla netscape";
 
 /** 
@@ -190,8 +192,9 @@ void rwSettings(bool writing)
 		 dit++) {
 		string dbdir = path_canon(*dit);
 		path_catslash(dbdir);
-		if (find(prefs.allExtraDbs.begin(), prefs.allExtraDbs.end(),
-			 dbdir) != prefs.allExtraDbs.end())
+		if (std::find(prefs.allExtraDbs.begin(), 
+			      prefs.allExtraDbs.end(), dbdir) != 
+		    prefs.allExtraDbs.end())
 		    continue;
 		if (!Rcl::Db::testDbDir(dbdir)) {
 		    LOGERR(("Not a xapian database: [%s]\n", dbdir.c_str()));
diff --git a/src/rcldb/stemdb.cpp b/src/rcldb/stemdb.cpp
index c9ec066e..38f7dc3b 100644
--- a/src/rcldb/stemdb.cpp
+++ b/src/rcldb/stemdb.cpp
@@ -1,7 +1,13 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.1 2006-04-13 09:50:03 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.2 2006-05-02 09:49:06 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
+/**
+ * Management of the auxiliary databases listing stems and their expansion 
+ * terms
+ */
+#include <unistd.h>
+
 #include <algorithm>
 #include <map>
 
diff --git a/src/unac/unac.c b/src/unac/unac.c
index f49866b4..c32aedfe 100644
--- a/src/unac/unac.c
+++ b/src/unac/unac.c
@@ -13221,8 +13221,9 @@ int unacmaybefold_string_utf16(const char* in, size_t in_length,
      * is not valid any more. We have to do the freeing and zero out *outp
      */
     if(out_length + ((l + 1) * 2) > out_size) {
+      char *saved;
       out_size += ((l + 1) * 2) + 1024;
-      char *saved = out;
+      saved = out;
       out = realloc(out, out_size);
       if(out == 0) {
 	if(debug_level >= UNAC_DEBUG_LOW)