--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Thu Nov 21 12:28:16 2013 -0800
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Tue Nov 26 16:40:31 2013 +0100
@@ -56,8 +56,8 @@
     int                 x, y;
 } X11RIPrivate;
 
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define XSD_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define XSD_MIN(a,b) ((a) < (b) ? (a) : (b))
 
 static LockFunc X11SD_Lock;
 static GetRasInfoFunc X11SD_GetRasInfo;
@@ -1090,10 +1090,10 @@
     x2 = x1 + DisplayWidth(awt_display, xsdo->configData->awt_visInfo.screen);
     y2 = y1 + DisplayHeight(awt_display, xsdo->configData->awt_visInfo.screen);
 
-    x1 = MAX(bounds->x1, x1);
-    y1 = MAX(bounds->y1, y1);
-    x2 = MIN(bounds->x2, x2);
-    y2 = MIN(bounds->y2, y2);
+    x1 = XSD_MAX(bounds->x1, x1);
+    y1 = XSD_MAX(bounds->y1, y1);
+    x2 = XSD_MIN(bounds->x2, x2);
+    y2 = XSD_MIN(bounds->y2, y2);
     if ((x1 >= x2) || (y1 >= y2)) {
         return FALSE;
     }