diff -uNr 5.13.03.ORIG/build/rmkdepend/imakemdep.h 5.13.03/build/rmkdepend/imakemdep.h --- 5.13.03.ORIG/build/rmkdepend/imakemdep.h 2005-11-29 01:05:18.000000000 +0900 +++ 5.13.03/build/rmkdepend/imakemdep.h 2006-10-08 12:29:00.000000000 +0900 @@ -915,7 +915,17 @@ #ifdef __ppc__ {"__ppc__", "1"}, #endif - /* add any additional symbols before this line */ +#ifdef __i386__ + {"__i386__", "1"}, +#endif +#if defined(__BIG_ENDIAN__) + {"__BIG_ENDIAN__", "1"}, +#endif +#if defined(__LITTLE_ENDIAN__) + {"__LITTLE_ENDIAN__", "1"}, +#endif + +/* add any additional symbols before this line */ {NULL, NULL} }; diff -uNr 5.13.03.ORIG/cint/src/gcc3strm.cxx 5.13.03/cint/src/gcc3strm.cxx --- 5.13.03.ORIG/cint/src/gcc3strm.cxx 2006-08-19 07:36:23.000000000 +0900 +++ 5.13.03/cint/src/gcc3strm.cxx 2006-10-07 01:25:54.000000000 +0900 @@ -308,13 +308,21 @@ static int G__G__stream_7_7_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { +#if 0 G__letint(result7, 103, (long) ((fpos*) G__getstructoffset())->operator==(*(fpos*) libp->para[0].ref)); +#else + G__letint(result7, 103, (long) ((*(fpos*) G__getstructoffset()) == (*(fpos*) libp->para[0].ref))); +#endif return(1 || funcname || hash || result7 || libp) ; } static int G__G__stream_7_8_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { +#if 0 G__letint(result7, 103, (long) ((fpos*) G__getstructoffset())->operator!=(*(fpos*) libp->para[0].ref)); +#else + G__letint(result7, 103, (long) ((*(fpos*) G__getstructoffset()) != (*(fpos*) libp->para[0].ref))); +#endif return(1 || funcname || hash || result7 || libp) ; } diff -uNr 5.13.03.ORIG/config/Makefile.macosx 5.13.03/config/Makefile.macosx --- 5.13.03.ORIG/config/Makefile.macosx 2006-08-31 23:15:57.000000000 +0900 +++ 5.13.03/config/Makefile.macosx 2006-10-07 00:15:20.000000000 +0900 @@ -25,16 +25,16 @@ # LD = c++ CXX = g++ CC = gcc -CXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ +CXXFLAGS = -pipe -W -Wall -Woverloaded-virtual \ -fsigned-char -fno-common $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) -CFLAGS = -pipe -W -Wall -Wno-long-double -fsigned-char -fno-common \ +CFLAGS = -pipe -W -Wall -fsigned-char -fno-common \ $(EXTRA_CFLAGS) $(FINK_CFLAGS) -CINTCXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ +CINTCXXFLAGS = -pipe -W -Wall -Woverloaded-virtual \ -fsigned-char -fno-common $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \ -DG__STD_EXCEPTION -CINTCFLAGS = -pipe -W -Wall -Wno-long-double -fsigned-char -fno-common \ +CINTCFLAGS = -pipe -W -Wall -fsigned-char -fno-common \ $(EXTRA_CFLAGS) $(FINK_CFLAGS) \ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \ -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \ diff -uNr 5.13.03.ORIG/config/root-config.in 5.13.03/config/root-config.in --- 5.13.03.ORIG/config/root-config.in 2006-09-01 18:47:15.000000000 +0900 +++ 5.13.03/config/root-config.in 2006-10-07 00:18:47.000000000 +0900 @@ -295,12 +295,10 @@ if [ $macosx_minor -le 3 ]; then finkdir=`which fink 2>&1 | sed -ne "s/\/bin\/fink//p"` auxcflags=`[ -d ${finkdir}/include ] && echo -I${finkdir}/include` - auxcflags="-Wno-long-double $auxcflags" auxlibs="-lm `[ -d ${finkdir}/lib ] && echo -L${finkdir}/lib` -ldl" forcelibs=$rootulibs forceglibs=$rootuglibs else - auxcflags="-Wno-long-double" auxlibs="-lm -ldl" fi ;; @@ -317,7 +315,7 @@ macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` # cannot find the one linked to libGraf if relocated after built rootlibs="$rootlibs -lfreetype" - auxcflags="-m64 -Wno-long-double" + auxcflags="-m64" auxldflags="-m64" auxlibs="-lm -ldl" ;; diff -uNr 5.13.03.ORIG/proof/inc/TProofDraw.h 5.13.03/proof/inc/TProofDraw.h --- 5.13.03.ORIG/proof/inc/TProofDraw.h 2006-05-15 18:45:03.000000000 +0900 +++ 5.13.03/proof/inc/TProofDraw.h 2006-10-07 11:28:19.000000000 +0900 @@ -221,9 +221,15 @@ std::vector *fVector; // vector public: +#if 0 TProofVectorContainer(std::vector* anVector) : fVector(anVector) { }; TProofVectorContainer() : fVector(0) { }; ~TProofVectorContainer() { delete fVector; } +#else + TProofVectorContainer(std::vector* anVector) : fVector(anVector) { } + TProofVectorContainer() : fVector(0) {} + ~TProofVectorContainer() { delete fVector; } +#endif std::vector *GetVector() const { return fVector; } Long64_t Merge(TCollection* list); diff -uNr 5.13.03.ORIG/proof/src/TProofDraw.cxx 5.13.03/proof/src/TProofDraw.cxx --- 5.13.03.ORIG/proof/src/TProofDraw.cxx 2006-08-31 20:05:20.000000000 +0900 +++ 5.13.03/proof/src/TProofDraw.cxx 2006-10-07 01:50:36.000000000 +0900 @@ -138,7 +138,11 @@ R__ASSERT(fDimension <= TTreeDrawArgsParser::GetMaxDimension()); for (int j = 0; j < fDimension; j++) v[j] = fVar[j]->EvalInstance(i); +#if 0 if (fDimension >= 1); +#else + if (fDimension >= 1) +#endif PDB(kDraw,4) Info("Process","v1[%d] = %f", i, v[0]); DoFill(entry, w, v); } diff -uNr 5.13.04b.ORIG/base/src/TTimeStamp.cxx 5.13.04b/base/src/TTimeStamp.cxx --- 5.13.04b.ORIG/base/src/TTimeStamp.cxx 2005-09-02 16:51:51.000000000 +0900 +++ 5.13.04b/base/src/TTimeStamp.cxx 2006-11-07 14:18:27.000000000 +0900 @@ -413,7 +413,12 @@ #if !defined(R__MACOSX) && !defined(R__FBSD) && !defined(R__OBSD) return timezone; // unix has extern long int #else +#if 0 time_t *tp = 0; +#else + time_t t; + time_t *tp = &t; +#endif time(tp); return localtime(tp)->tm_gmtoff; #endif