Remove support for Metrowerks compiler

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 1 insertions, 58 deletions

diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h
index dba22768..0eaeee39 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h
@@ -100,7 +100,6 @@ public:
         CHXBuffer(UCHAR* pData, UINT32 ulLength, HXBOOL bOwnBuffer = TRUE);
 
 #if 0
-#ifndef __MWERKS__
 #if defined (_DEBUG) && defined (_WIN32) && 0
          void * operator new(
         unsigned int,
@@ -112,7 +111,6 @@ public:
         void * 		operator	new (size_t size);
 #endif /*defined (_DEBUG) && defined (_WIN32) */
         void		operator	delete(void *p, size_t size);
-#endif /*__MWERKS__*/
 #endif /*0*/
 
         inline CHXBuffer& operator=(const char* psz);
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
index fea8c8d8..acc6a0b4 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
@@ -429,8 +429,6 @@ int safe_int_func_call(LONG32 f);
 
 #endif
 
-#elif defined ( __MWERKS__ )
-#define HX_SAFE_VOID2HANDLE(f)	(f)
 #elif defined ( _UNIX )
 #define HX_SAFE_VOID2HANDLE(f)	(f)
 #endif // end of#if defined(_WIN32) || defined(_WINDOWS)
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
index 4f55daa8..89a94bf4 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
@@ -980,56 +980,6 @@ extern "C" {
 
 
 /***********************************************************************
- * MAC / PowerPC (CW)
- *
- * Implementation Notes:
- *
- * This will need to be rewritten, probably, once we move away from CW to PB.
- *
- * Note: This is an imcompletely-defined platform, be aware that
- * not all standard HXAtomic operators are defined!
- *
- */
-#elif defined(_MACINTOSH) && defined(__MWERKS__)
-
-inline UINT32
-HXAtomicIncRetUINT32(UINT32* pNum)
-{
-    UINT32 zeroOffset = 0;
-    UINT32 temp;
-
-    asm
-    {
-	again:
-	    lwarx temp, zeroOffset, pNum
-	    addi temp, temp, 1
-	    stwcx. temp, zeroOffset, pNum
-	    bne- again
-    }
-
-    return temp;
-}
-
-inline UINT32
-HXAtomicDecRetUINT32(UINT32* pNum)
-{
-    UINT32 zeroOffset = 0;
-    UINT32 temp;
-
-    asm
-    {
-	again:
-	    lwarx temp, zeroOffset, pNum
-	    subi temp, temp, 1
-	    stwcx. temp, zeroOffset, pNum
-	    bne- again
-    }
-
-    return temp;
-}
-
-
-/***********************************************************************
  * MAC - PowerPC (PB or XCode) / Linux - PowerPC
  *
  * Implementation Notes:
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h
index b332bc63..ba36c66a 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h
@@ -235,8 +235,7 @@ typedef unsigned int	MMRESULT;
 
 #if !defined(BEGIN_INTERFACE)
 #if defined(_MPPC_)  && \
-    ( (defined(_MSC_VER) || defined(__SC__) || defined(__MWERKS__)) && \
-    !defined(NO_NULL_VTABLE_ENTRY) )
+    ( (defined(_MSC_VER) || defined(__SC__)) && !defined(NO_NULL_VTABLE_ENTRY) )
    #define BEGIN_INTERFACE virtual void a() {}
    #define END_INTERFACE
 #else
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
index b6091413..7f002c51 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
@@ -208,8 +208,6 @@ new_path_string(const char* str)
             *pdst = '\\';
 #elif defined _UNIX || defined _OPENWAVE
             *pdst = '/';
-#elif defined __MWERKS__
-            *pdst = ':';
 #else
 	    *pdst = *psrc;
 #endif