Mac OS X compile fixes:

	-disable the "fuege alle libs auf verdacht hinzu" hack and hope we will
         identify the root cause.
	-do not redefine cxa_... on Mac. At least the the Apple Linker is not happy
         with having that symbol defined twice.
        -well DYLD_BOOL could not be casted to bool. changing it to bool works
	-opiecore.pro use the same test as in include.pro to see if we build on linux

2 files changed, 2 insertions, 2 deletions

diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp
index 2181153..fee73c2 100644
--- a/library/qlibrary_unix.cpp
+++ b/library/qlibrary_unix.cpp
@@ -144,25 +144,25 @@ bool QLibraryPrivate::loadLibrary()
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
         //qDebug("QLibraryPrivate::freeLibrary\n");
         //return FALSE;
     if ( !pHnd )
         return TRUE;
 
         DyldLibDesc* desc = (DyldLibDesc*) pHnd;
         NSModule mod = desc->mod;
         NSObjectFileImage img = desc->img;
-        DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
+        bool success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
         if ( success ) {
         NSDestroyObjectFileImage(img);
         delete desc;
         pHnd = 0;
         }
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     else {
             qWarning( "Error in NSUnLinkModule()" );
     }
 #endif
     return pHnd == 0;
 }
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 19e99f2..dcc1001 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -2198,25 +2198,25 @@ void QPEApplication::hideOrQuit()
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
         e << d->appName;
         d->qpe_main_widget->hide();
     }
 #endif
     else
         quit();
 }
 
-#if (__GNUC__ > 2 )
+#if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
 extern "C" void __cxa_pure_virtual();
 
 void __cxa_pure_virtual()
 {
     fprintf( stderr, "Pure virtual called\n");
     abort();
 
 }
 
 #endif