Changeset 220

Timestamp:

Dec 29, 2010, 7:39:42 PM (15 years ago)

Author:

dmik

Message:

jdk/awt: Fixed ILINK build: Made new[]/delete[] overloads extern so that ILINK will use them instead of the ones provided by libc.

Location:

trunk/openjdk/jdk/src/windows/native/sun/windows

Files:

• awt_Debug.cpp (modified) (2 diffs)
• awt_Debug.h (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.cpp

@@ -48 +48 @@
 }
 
+#ifdef __GNUC__
+void * operator new[](size_t size, const char * filename, int linenumber) {
+    return operator new(size, filename, linenumber);
+}
+#endif
+
 #if _MSC_VER >= 1200
 void operator delete(void *ptr, const char*, int) {
@@ -56 +62 @@
     DMem_FreeBlock(ptr);
 }
+#ifdef __GNUC__
+void operator delete[](void *ptr) {
+    operator delete(ptr);
+}
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h

@@ -50 +50 @@
     extern void * operator new(size_t size, const char * filename, int linenumber);
 #ifdef __GNUC__
-    inline void * operator new[](size_t size, const char * filename, int linenumber) {
-        return operator new(size, filename, linenumber);
-    }
+    extern void * operator new[](size_t size, const char * filename, int linenumber);
 #endif
 #if _MSC_VER >= 1200
@@ -60 +58 @@
     extern void operator delete(void *ptr);
 #ifdef __GNUC__
-    inline void operator delete[](void *ptr) {
-        return operator delete(ptr);
-    }
+    extern void operator delete[](void *ptr);
 #endif
     extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);