--- xapian-core-1.2.3/api/matchspy.cc	Tue Aug 24 09:50:23 2010
+++ xapian-core-1.2.3/api/matchspy.cc	Sat Aug 28 07:31:37 2010
@@ -136,12 +136,13 @@
 	return it == spy->values.end();
     }
 
-    Xapian::termcount get_approx_size() const { unsupported_method(); }
-    Xapian::termcount get_wdf() const { unsupported_method(); }
+    Xapian::termcount get_approx_size() const { unsupported_method(); return 0; }
+    Xapian::termcount get_wdf() const { unsupported_method(); return 0; }
     Xapian::PositionIterator positionlist_begin() const {
 	unsupported_method();
+	return Xapian::PositionIterator(NULL);
     }
-    Xapian::termcount positionlist_count() const { unsupported_method(); }
+    Xapian::termcount positionlist_count() const { unsupported_method(); return 0; }
 };
 
 /** A string with a corresponding frequency.
@@ -233,12 +234,13 @@
 	return it == values.end();
     }
 
-    Xapian::termcount get_approx_size() const { unsupported_method(); }
-    Xapian::termcount get_wdf() const { unsupported_method(); }
+    Xapian::termcount get_approx_size() const { unsupported_method(); return 0; }
+    Xapian::termcount get_wdf() const { unsupported_method(); return 0; }
     Xapian::PositionIterator positionlist_begin() const {
 	unsupported_method();
+	return Xapian::PositionIterator(NULL);
     }
-    Xapian::termcount positionlist_count() const { unsupported_method(); }
+    Xapian::termcount positionlist_count() const { unsupported_method(); return 0; }
 };
 
 /** Get the most frequent items from a map from string to frequency.
--- xapian-core-1.2.3/common/const_database_wrapper.cc	Tue Aug 24 09:50:23 2010
+++ xapian-core-1.2.3/common/const_database_wrapper.cc	Sat Aug 28 08:00:34 2010
@@ -303,6 +303,7 @@
 ConstDatabaseWrapper::add_document(const Xapian::Document &)
 {
     nonconst_access();
+    return 0;
 }
 
 void
@@ -328,6 +329,7 @@
 				       const Xapian::Document &)
 {
     nonconst_access();
+    return 0;
 }
 
 void
@@ -341,4 +343,5 @@
 ConstDatabaseWrapper::as_remotedatabase()
 {
     nonconst_access();
+    return NULL;
 }
--- xapian-core-1.2.3/net/tcpclient.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/net/tcpclient.cc	Sat Aug 28 08:29:36 2010
@@ -40,6 +40,8 @@
 # include "safesysselect.h"
 #endif
 
+using namespace std;
+
 int
 TcpClient::open_socket(const std::string & hostname, int port,
 		       double timeout_connect, bool tcp_nodelay)
--- xapian-core-1.2.3/tests/perftest/runprocess.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/tests/perftest/runprocess.cc	Sat Aug 28 10:59:47 2010
@@ -22,7 +22,7 @@
 #include "runprocess.h"
 #include "stringutils.h"
 
-#include <cstdio>
+#include <stdio.h>
 #include <string>
 
 #include "safesyswait.h"
--- xapian-core-1.2.3/tests/harness/testsuite.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/tests/harness/testsuite.cc	Sat Aug 28 10:53:45 2010
@@ -48,7 +48,7 @@
 
 #include "gnu_getopt.h"
 
-#include <csetjmp>
+#include <setjmp.h>
 #include <signal.h>
 
 #include <exception>
--- xapian-core-1.2.3/tests/harness/backendmanager_remotetcp.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/tests/harness/backendmanager_remotetcp.cc	Sat Aug 28 10:58:08 2010
@@ -26,7 +26,7 @@
 #include <xapian.h>
 
 #include "safeerrno.h"
-#include <cstdio> // For fdopen().
+#include <stdio.h> // For fdopen().
 #include <cstring>
 
 #ifdef HAVE_FORK
--- xapian-core-1.2.3/tests/api_replicate.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/tests/api_replicate.cc	Sat Aug 28 10:44:55 2010
@@ -43,6 +43,8 @@
 #include <cstdlib>
 #include <string>
 
+#include <stdlib.h> // For setenv()
+
 using namespace std;
 
 static void rmtmpdir(const string & path) {
--- xapian-core-1.2.3/unicode/utf8itor.cc	Tue Aug 24 09:50:22 2010
+++ xapian-core-1.2.3/unicode/utf8itor.cc	Sat Aug 28 08:44:51 2010
@@ -23,6 +23,8 @@
 
 #include <cstring>
 
+using namespace std;
+
 inline bool bad_cont(unsigned char ch) { return (ch & 0xc0) != 0x80; }
 
 namespace Xapian {
--- classXapian_1_1DecreasingValueWeightPostingSource__inherit__graph.png	Tue Aug 24 10:00:22 2010
+++ classXapian_1_1DecreasingValueWeightPostingSource__inherit__graph.png
@@ -1,19 +0,0 @@
-PNG
-
-   IHDR  C     *)^   bKGD      tIME 4  "EIDATxTAzc	RMʠEZ J ?2&3:Hh;22/3Q$AH"ٜݻ\.g7=9O<{5 ?P      C  d o}<yD	I@wD
-+VEd|@Dt>:!Gdt>?"Cr|ӏnST7dӪ4FÇs(Uӎ;+wi{gvږ?~+Su6oތ!wykР-Y$ŋaÆwLѣֿ{ꩧr;t`FիWė/_nZBnGۻwU\>SUT}EֵkW+^*T:vD̙3bŊVhQQ^x1DkܹVV-g\5]v%}'NXb"/\`C%K6lcƍV~}wma޼y2D*.puTR%Wg,XΞ=Oرe5kU^>|eddXtꫯF<qDP)RzegΜA0uċ-r٠bٲeQիg[lqٛ/juIMѩS'{0Ҁꫯܹs6ekڴɓQ2?~+yM0!r\BXrmȐ!YMښ*S~6mO>}YyPÖѿt0i$k߾:tN:ecǎ:uk2rHdS{ZҤIk֬Y2 #?3y^;9qTV~N@UVuP\Z5j؛oirh]Qf:_"R̴pVfMÖ?Lj+L\<$`e~m{](KGY-\M)74rJ1̹Vjٽ{w7=˗;vp[rnݺnݺ,&xNtoׯ_wm6to:;v^2e-w5Κj~?3DJseWн˪HœцZ͒Wǉ2DÖ_w<?Xd2eMLmeW|53nrٲem͚5nMYkNLٔ֥K{0
-\VcF}S8ƍݻ{8\t֯_=2fUΓO>i|5CkX/Fm-[]~-uhR*#'ONf8}tFݻw6C0d55`3f[,Ni74:g0纕2y+QoV,]~a!iӦȱiӦ]d.A>ڕU]I4uƒ~~|i~P?kܸ+̙XF&kmR*][׮]3fDv36dSj0;W7"ԩCdMA;|a7Դgv됚n~dMD.:ȐG@t>?2(ΟD%!/t銽j*s{z"kQVX˛7?q";w[bhE'IR7!'B.ًV'AޢB Bz;U3kog\R BѫVmajlT
- CH/N8gի=v{*!w=!=zdCί;eX8{r BzpIlfرkT CH~-.BSI!i7Kol\֬9f~Jd;}J?a͛O Bj3sﳿBkRY!u	ӧKe2ȑ6xO?]'6^ѳmʔ5T CHVd"C@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@S?zIhz!u/<y	"Nhl(a 0>!2`| Cd@il 2o&#Cd4h1"Ç޷oU\.\SaÆv&RJ;v,WZڵ-VL֭m޼"l[lɒ%Q8\u=z9s=+СCod:zߞz\!:بQvU'˗[V!2L޻w˪>SUTq_|a]vŋ[Bcǎnp̙3bŊVhQQ^x1ssZZ@֨Q#۵kWRxwis]v-Kz\?pI'N
-*X"EW^v̙?q+V,^Y]dIÆl7nhw7o^3QyQTk?,hgϞMoTz=k,6yu]|222|Vti{WC72D7-ZAŲeˢիW϶l7}ׯ_TܹSN aΥNW_ٹslʔ)ִiP2۷+VD?=ӡv0O:ڵkgrRK#GL}M2?~+ّ#G\66aq	aʕrA2dHDumM{)M6֧O۾}{BPÖѿt0i$׆S-m;6t}#CdxI&֬YPSk=?>̔.޹Ak*,۶m$O	?}YY2i	AYV?p@' U{VV-Fof[d(KP/)SfZpaY{p\_uq/GP}#CdxS߶~؅D?}he5̛xZS+WD<y+c<mݺս޴inTc5\^hٽ{w7=˗v2rYݺumݺuYM񮝨_R4%n۶mHuN'Aa{Ϟ=)La:?YJo6Sgz(Cspڵn-Ph{7t}>eTǏ:MD[7eD,6luoN&ʢAz2àF0[Ϊի#iʿ\lY[f[ :OlV?uŞ{>̹^졇:k@km#BVO>ݭlf|aeZ>nܸ޽{6֯_=2fUΓO>i|5CkX/Fm-[]Wɓ''\3odZw`1cƸj!Qj)֎xLڿs&UsP,\e&S\O>ƍhJ?׮3";)ygD.ڿYtRҔcڴinG<nrzSʪ$݃63 PuMOTʨdMꡥkk9l}#Cdx|hYN:dHc#CSP>|M?5e| Cgv됚n7G֌dHc0>!@46  dHc0>!7+A%0>jlW;O<uC"S?N~Y*cc~G
-dpv=N/
-dMWQ)!0aլ9>"?JdW{'FD()fd,b Bz{`FD~.]B 2g?ը1>JUwS9!=8ծ=!J
-qذ @^ӪU$CEZًT CH}U>.VͰw Bs"TT6zCE2fIe^=N8Ge2ԥYЋdɑ#CPѭT CHV"C@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@! C d 2@<+V)/0ɐHXF`Ŗ'O"E#_VE22	22D !  Cd  2D aN뀔!2L˚2冺F0GpРA6bĈL>k:ξ}rvO:e6'Oz1X]x1'|2ZBohȷTRֳgϛV[-ӧO۳>kk׶[2e[nyfd&[lɒ%Qߗ8\yzas̉{W^C޶?8qu]7D>Sά+==jz*WȰC6j(;p]zI|֪U+d>M޻w˪>SUTq_|a]vŋ[Bcǎnm̙.*Z(Y,a5w\U(P5jdvJ:;w{Ǯ]uҥKVzuwOaV|'Nt]"EW^vwl֥Kȿ}ww׮]}%;O50`J*z-sSD)q+V,*Ճdɒ.oܸׯﮧΛ7/;~,hgϞMڿz=k,ׇ>|eddXtꫯ0P,Zee˖EWmٲuLoZү_FܹSNXaΥW_ٹslʔ)ִiP2駟}dԩ֮];;tZr9rddVCeE]^s.Tc˜Ih)/C]Sm{9r&L9.!\= 2dHDAۦMӧm߾=L&a_:4ikO`Ǝ_ \ CѤIk֬YzF#?33Uw.e&Z
-˶m2SC_? Q6LCMًD믻׏=͛7wg̘ᎇ9ժUs٭=/45}ZkSQF{7<A+A̴pVfMW)_uܛi#=aom?e~>#kѢ)7]MS+W$aΕuGyĶn^oڴZn}C*1v*?{iuYLf|2uVid NvMرelʕuںu]nGSmۆ.QyԞ0pϞ='ku*YSgM+Lşu'oseWZZРxnT<?u\wɐ?F2i}顇
-}5vJfG>5Hœцf'~eZK[vwda~s	4Be˖5kָFS'E{.ng
-s^R؂k@kX#unVO>ݭE,a|~4MVƴp6os9n8J+&?-pad4*G޽Ub7~kceK=zl2t9^'Op0L@9PZw1cƸ,FHhj57x#Sg&뜉v+2S\O>ƍhH?׮P	8vIhRiӦ9չ=y+QoV,]MUOzji"tπB26?*P;+66d7PÝAu~Sd! Mɴ[za74Egvr~7G/2D !2@ Cd!2D "ta߾T2Daez[uG]x Û(C"5dɖVX˗ЦL'?aғUd㿥B Bz2{V8'CŁǨ@~<%k@^he*!ӧ}68>r BzAF/e8uZ*!;v$B/|Ev:RI}8!oO%2ʕkL(BM'LXNE2fֽ$h/_ B2f̢ZǏ=T CHM.^ ĨQ0@:u֭*'BZjN'C d2d C@ ! 2d C@ ! 2d C@ ! 2d C@ ! 2d C@ ! 2d C@ ! 2d C@ ! 2d C@ ! 2tŋ-O<q[`VLgꂸ!ׅk ,p۶mA)Ȑ A C dH	 !: '!0/'eVʔ"ɰcǎֵkLwŞx\YAyZѢE{>}իӺ,\ʖ-kwnݺnݺ[>PK?-ZDWYnf?q_<+VZn}tŷ~z޽U\g%J͛kccӦMVNկ~L50t,7gQO~ʕ+gK.Mk!jƎذaìsηmj@`k֬w3J$C۵kg=XaӦM[nd۲e+B/,XBP&WE>VH+PG?z2Z#FpOB
-%̹222RJ?~͛7/iOtp{ѷoH۴ic6lgϞVT)+^92F
-*|Aj׮Y>a~ k߾+C2e\x׃Zju֨ѽ^a'8/l?#vƌӧO|_3_߽&OpQ$(4g6
-}gƍIP9xH6~N<e^z)XZl֬Y⽴m۶QzGܠQ4kzK;n 2\|^`[bk-	ׯ_並=zTF$t4SLqSN	/Y?uٔ*?#SL81i$Yhաotj/_3/PTVZ岱^zemoE{7n~~3-<$?A#6P>{BMeu-Z>D@s׭t\kٝvhP)דVY^@OVｗ)%ʕ+>:_}WXƌ:HPKV?˗wٝ^믿ܹsCOAT'stAСC0_3/4CQؙ^Ym[4L,ʢz3a;.^x^I6l螆
-z7oޜ9׭-YWb)ru]>^#|A-^dIRJt1+Rc";sٟ^FP%N4ӴO*[{25jDA6P4lٲɮaVZђM4	])cԞwTwFkU飩MP:ѓ%̹nfZSD	c?:_};֘Sԏ׎2Zb̙7>ڵkՉB2?~|d)֗gW>B׌aVwl?K
-*P;ǻ^_ܱdZ>7YӦMsOlUb+CO>oBÜ+3]3TiiAnaZ'Q]	?ٕ;޿ke:_}?,W^qL728hhWVJeb/ѲTڭʘ&MY7}sPi?#C]ӿf>ӶAn{kXkdi_WhY"l9^0PB^>zLM9F9WveTs$5K'97q%QAݲde:_}njNPծA2 /$]+vI$+Utݷ~?T'yiz`齿Γ!C~fSMۍk&mr6ԇզT>4?AO~k_rs
-2LДD_t$^s|pR~7fA?_dH	 !A2$@AȐ "eH(Ã?o"H  A     G#OTV~4    IENDB`
