Changeset 184

Timestamp:

Dec 1, 2010, 3:30:14 AM (14 years ago)

Author:

dmik

Message:

jdk/awt: Continued.

Location:

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

Files:

• WPrinterJob.cpp (modified) (2 diffs)
• awt.h (modified) (2 diffs)
• awt_Debug.h (modified) (1 diff)

trunk/openjdk/jdk/src/windows/native/sun/windows/WPrinterJob.cpp ¶

@@ -29 +29 @@
 #include <limits.h>
 #include <float.h>
+#ifdef __WIN32OS2__
+#include <minivcrt.h>
+#endif
 
 #include "awt.h"
@@ -876 +879 @@
           if (papers != NULL &&
               ::DeviceCapabilities(printerName, printerPort,
-                                   DC_PAPERS, papers, NULL) != -1) {
+                                   DC_PAPERS, (LPTSTR)papers, NULL) != -1) {
               int present = 0;
               for (int i=0;i<numSizes;i++) {

trunk/openjdk/jdk/src/windows/native/sun/windows/awt.h ¶

@@ -199 +199 @@
  * NOTE: float.h must be defined if using these macros
  */
+#ifdef __WIN32OS2__
+#define SAVE_CONTROLWORD
+#define RESTORE_CONTROLWORD
+#else
 #define SAVE_CONTROLWORD  \
    unsigned int fpu_cw = _CW_DEFAULT;   \
@@ -211 +215 @@
        }   \
    }
+#endif
 
 /*

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

@@ -49 +49 @@
 
     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);
+    }
+#endif
 #if _MSC_VER >= 1200
     /* VC 6.0 is more strict about enforcing matching placement new & delete */