From 6c09d788597eb5f36f8f80b4aa81b9c8a1cb23c8 Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Thu, 14 Apr 2011 13:53:08 +0400
Subject: [PATCH] 7036540: A change for 7021001 and some makefile changes have
 been pushed as a part of 7030062

Reviewed-by: dcherepanov
---
 jdk/make/sun/jpeg/Makefile                  |  2 +-
 jdk/src/share/classes/java/awt/Toolkit.java | 33 ---------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/jdk/make/sun/jpeg/Makefile b/jdk/make/sun/jpeg/Makefile
index ddd8e3bc7a8..78c53c461a1 100644
--- a/jdk/make/sun/jpeg/Makefile
+++ b/jdk/make/sun/jpeg/Makefile
@@ -74,7 +74,7 @@ ifeq ($(PLATFORM), linux)
   # volatile to prevent the optimization. However, this approach does not
   # work because we have to declare all variables as volatile in result.
 
-#  OTHER_CFLAGS += -Wno-clobbered
+  OTHER_CFLAGS += -Wno-clobbered
 endif
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk
diff --git a/jdk/src/share/classes/java/awt/Toolkit.java b/jdk/src/share/classes/java/awt/Toolkit.java
index 2f474e970e0..105bc1bf325 100644
--- a/jdk/src/share/classes/java/awt/Toolkit.java
+++ b/jdk/src/share/classes/java/awt/Toolkit.java
@@ -466,10 +466,6 @@ public abstract class Toolkit {
      */
     protected void loadSystemColors(int[] systemColors)
         throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
-
     }
 
 /**
@@ -504,10 +500,6 @@ public abstract class Toolkit {
      */
     public void setDynamicLayout(boolean dynamic)
         throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
-
     }
 
     /**
@@ -531,9 +523,6 @@ public abstract class Toolkit {
      */
     protected boolean isDynamicLayoutSet()
         throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().isDynamicLayoutSet();
         } else {
@@ -569,9 +558,6 @@ public abstract class Toolkit {
      */
     public boolean isDynamicLayoutActive()
         throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().isDynamicLayoutActive();
         } else {
@@ -615,9 +601,6 @@ public abstract class Toolkit {
      */
     public Insets getScreenInsets(GraphicsConfiguration gc)
         throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().getScreenInsets(gc);
         } else {
@@ -1359,9 +1342,6 @@ public abstract class Toolkit {
      * @since 1.4
      */
     public Clipboard getSystemSelection() throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().getSystemSelection();
         } else {
@@ -1391,10 +1371,6 @@ public abstract class Toolkit {
      * @since     JDK1.1
      */
     public int getMenuShortcutKeyMask() throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
-
         return Event.CTRL_MASK;
     }
 
@@ -1523,9 +1499,6 @@ public abstract class Toolkit {
      */
     public Dimension getBestCursorSize(int preferredWidth,
         int preferredHeight) throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         // Override to implement custom cursor support.
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().
@@ -1553,9 +1526,6 @@ public abstract class Toolkit {
      * @since     1.2
      */
     public int getMaximumCursorColors() throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         // Override to implement custom cursor support.
         if (this != Toolkit.getDefaultToolkit()) {
             return Toolkit.getDefaultToolkit().getMaximumCursorColors();
@@ -2602,9 +2572,6 @@ public abstract class Toolkit {
     * @since 1.7
      */
     public boolean areExtraMouseButtonsEnabled() throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()){
-            throw new HeadlessException();
-        }
         return Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled();
     }
 }