2009/6/30 Oliver Tappe <zooey@xxxxxxxxxxxxxxx>: > Hi Adrien, > > On 2009-06-30 at 22:01:48 [+0200], PulkoMandy <pulkomandy@xxxxxxxxx> wrote: >> fixed... finally. > > not quite, I suppose: > >> Index: src/kits/locale/DefaultCatalog.cpp >> =================================================================== >> --- src/kits/locale/DefaultCatalog.cpp (rvision 31342) >> +++ src/kits/locale/DefaultCatalog.cpp (copie de travail) >> @@ -29,7 +29,6 @@ >> >> #include <cstdio> >> >> - > > how come? > >> using std::auto_ptr; >> using std::min; >> using std::max; >> @@ -42,7 +41,12 @@ >> * is provided as part of liblocale.so. >> */ >> >> +#if B_BEOS_VERSION <= B_BEOS_VERSION_5 && !defined(__HAIKU__) >> +// B_BAD_DATA was introduced with DANO, so we define it for R5: >> +# define B_BAD_DATA -2147483632L >> +#endif > > why? > >> >> + >> static const char *kCatFolder = "catalogs"; >> static const char *kCatExtension = ".catalog"; > > These things usually happen when you overwrite updated files with modified > backups with your own changes - so please don't do that. > > Things will get easier, once you can commit the stuff yourself. > > cheers, > Oliver > > Well, sorry, i tried to use svn&vim to do the merging of some changes i did and i think i missed some parts because svn tries to keep both your changes to my patches and my version alive. Next time i'll wait for you to commit my patches before changing anything, but that means i can't work in the meantime... -- Adrien Destugues / PulkoMandy Elève ingénieur ENSSAT EII1- www.enssat.fr GSoC student for Haiku - http://haiku-os.org GrafX2 project team - http://code.google.com/p/grafx2