diff -uNr 5.15.02.ORIG/build/rmkdepend/imakemdep.h 5.15.02/build/rmkdepend/imakemdep.h
--- 5.15.02.ORIG/build/rmkdepend/imakemdep.h	2005-11-29 01:05:18.000000000 +0900
+++ 5.15.02/build/rmkdepend/imakemdep.h	2007-02-28 12:49:20.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.15.02.ORIG/cint/src/gcc3strm.cxx 5.15.02/cint/src/gcc3strm.cxx
--- 5.15.02.ORIG/cint/src/gcc3strm.cxx	2006-11-24 22:14:37.000000000 +0900
+++ 5.15.02/cint/src/gcc3strm.cxx	2007-02-28 12:49:20.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 __GNUC__ >= 4 || __GNUC_MINOR__ >= 2
+      G__letint(result7, 103, (long) ((*(fpos<mbstate_t>*) G__getstructoffset()) == (*(fpos<mbstate_t>*) libp->para[0].ref)));
+#else
       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) 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 __GNUC__ >= 4 || __GNUC_MINOR__ >= 2
+      G__letint(result7, 103, (long) ((*(fpos<mbstate_t>*) G__getstructoffset()) != (*(fpos<mbstate_t>*) libp->para[0].ref)));
+#else
       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
+#endif
    return(1 || funcname || hash || result7 || libp) ;
 }
 
diff -uNr 5.15.02.ORIG/config/Makefile.macosx 5.15.02/config/Makefile.macosx
--- 5.15.02.ORIG/config/Makefile.macosx	2007-02-08 01:35:49.000000000 +0900
+++ 5.15.02/config/Makefile.macosx	2007-02-28 18:45:20.000000000 +0900
@@ -60,8 +60,8 @@
                 -undefined dynamic_lookup -install_name $(LIBDIR)/
 FORCELINK     = no
 NEEDFINK      = no
-CXXFLAGS     += -fvisibility-inlines-hidden
-CINTCXXFLAGS += -fvisibility-inlines-hidden
+#CXXFLAGS     += -fvisibility-inlines-hidden
+#CINTCXXFLAGS += -fvisibility-inlines-hidden
 else
 ifeq ($(MACOSX_MINOR),3)
 SOFLAGS       = $(OPT) -dynamiclib -single_module \
diff -uNr 5.15.02.ORIG/thread/inc/TAtomicCountGcc.h 5.15.02/thread/inc/TAtomicCountGcc.h
--- 5.15.02.ORIG/thread/inc/TAtomicCountGcc.h	2006-11-17 03:07:33.000000000 +0900
+++ 5.15.02/thread/inc/TAtomicCountGcc.h	2007-02-28 12:49:20.000000000 +0900
@@ -28,7 +28,11 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+#if __GNUC__ >= 4 || __GNUC_MINOR__ >= 2
+#include <ext/atomicity.h>
+#else
 #include <bits/atomicity.h>
+#endif
 
 #if defined(__GLIBCXX__) // g++ 3.4+