From 32823b0cca916a816a7ecf529c301b51f5d7bc39 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Thu, 13 Mar 2008 23:45:36 +0000
Subject: [PATCH]

---
 ase/awk/Awk.cpp | 10 +---------
 ase/awk/Awk.hpp | 11 +----------
 ase/cmn/types.h |  7 +++++--
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/ase/awk/Awk.cpp b/ase/awk/Awk.cpp
index dab50231..c5a81bb7 100644
--- a/ase/awk/Awk.cpp
+++ b/ase/awk/Awk.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.cpp 123 2008-03-12 12:06:22Z baconevi $
+ * $Id: Awk.cpp 129 2008-03-13 05:45:36Z baconevi $
  *
  * {License}
  */
@@ -230,11 +230,7 @@ void Awk::Argument::clear ()
 	this->inum = 0;
 }
 
-#if defined(__SPU__)
-void* Awk::Argument::operator new (std::size_t n, awk_t* awk) throw ()
-#else
 void* Awk::Argument::operator new (size_t n, awk_t* awk) throw ()
-#endif
 {
 	void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n);
 	if (ptr == ASE_NULL) return ASE_NULL;
@@ -243,11 +239,7 @@ void* Awk::Argument::operator new (size_t n, awk_t* awk) throw ()
 	return (char*)ptr+ASE_SIZEOF(awk);
 }
 
-#if defined(__SPU__)
-void* Awk::Argument::operator new[] (std::size_t n, awk_t* awk) throw ()
-#else
 void* Awk::Argument::operator new[] (size_t n, awk_t* awk) throw ()
-#endif
 {
 	void* ptr = ase_awk_malloc (awk, ASE_SIZEOF(awk) + n);
 	if (ptr == ASE_NULL) return ASE_NULL;
diff --git a/ase/awk/Awk.hpp b/ase/awk/Awk.hpp
index b588d3ce..96f15331 100644
--- a/ase/awk/Awk.hpp
+++ b/ase/awk/Awk.hpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.hpp 123 2008-03-12 12:06:22Z baconevi $
+ * $Id: Awk.hpp 129 2008-03-13 05:45:36Z baconevi $
  *
  * {License}
  */
@@ -11,10 +11,6 @@
 #include <ase/cmn/map.h>
 #include <stdarg.h>
 
-#if defined(__SPU__)
-#include <new>
-#endif
-
 /////////////////////////////////
 ASE_BEGIN_NAMESPACE(ASE)
 /////////////////////////////////
@@ -311,13 +307,8 @@ public:
 
 	public:
 		// initialization
-	#if defined(__SPU__)
-		void* operator new (std::size_t n, awk_t* awk) throw ();
-		void* operator new[] (std::size_t n, awk_t* awk) throw ();
-	#else
 		void* operator new (size_t n, awk_t* awk) throw ();
 		void* operator new[] (size_t n, awk_t* awk) throw ();
-	#endif
 
 	#if !defined(__BORLANDC__) 
 		// deletion when initialization fails
diff --git a/ase/cmn/types.h b/ase/cmn/types.h
index 86d89257..cbc31e53 100644
--- a/ase/cmn/types.h
+++ b/ase/cmn/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h 119 2008-03-07 03:04:51Z baconevi $
+ * $Id: types.h 129 2008-03-13 05:45:36Z baconevi $
  *
  * {License}
  */
@@ -35,7 +35,10 @@ typedef int ase_tri_t;
 #define ase_dead   -1
 
 /* integer that can hold a pointer */
-#if ASE_SIZEOF_VOID_P == ASE_SIZEOF_INT
+#if defined(__SPU__) && (ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG)
+	typedef long ase_int_t;
+	typedef unsigned long ase_uint_t;
+#elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_INT
 	typedef int ase_int_t;
 	typedef unsigned int ase_uint_t;
 #elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG