Changeset 191

Timestamp:

Dec 6, 2010, 2:37:09 PM (15 years ago)

Author:

dmik

Message:

jdk: awt: Disabled the set_new_handler() code completely as in the current version it doesn't seem to do anything but return a failure (despite what's stated in the comments).

Location:

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

Files:

• awt_Toolkit.cpp (modified) (1 diff)
• awt_new.cpp (modified) (3 diffs)
• awt_new.h (modified) (2 diffs)

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

@@ -407 +407 @@
     VERIFY(tk.RegisterClass() != NULL);
 
+#ifndef __WIN32OS2__
     // Set up operator new/malloc out of memory handler.
     NewHandler::init();
+#endif
 
         //\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\

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

@@ -24 +24 @@
  */
 
+#ifndef __WIN32OS2__
 #include <new.h>
+#endif
 #include <stdio.h>
 #include "awt_new.h"
@@ -47 +49 @@
 #endif
 
+#ifndef __WIN32OS2__
 
 void
@@ -78 +81 @@
     return FALSE;
 }
+
+#endif /* !__WIN32OS2__ */
 
 // These three functions throw std::bad_alloc in an out of memory condition

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

@@ -29 +29 @@
 #include "awt.h"
 
+#ifndef __WIN32OS2__
 
 // This class is used for establishing and implementing an operator new/
@@ -45 +46 @@
 };
 
+#endif /* !__WIN32OS2__ */
+
 #endif /* AWT_NEW_H */