--- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	2017-10-16 13:03:45.173459472 -0700
+++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	2017-10-16 13:03:45.017459933 -0700
@@ -583,8 +583,8 @@
      * Strip the AT-SPI GTK_MODULEs if present
      */
     gtk_modules_env = getenv ("GTK_MODULES");
-    if (gtk_modules_env && strstr (gtk_modules_env, "atk-bridge") ||
-        gtk_modules_env && strstr (gtk_modules_env, "gail"))
+    if ((gtk_modules_env && strstr (gtk_modules_env, "atk-bridge")) ||
+        (gtk_modules_env && strstr (gtk_modules_env, "gail")))
     {
         /* the new env will be smaller than the old one */
         gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc,
@@ -598,7 +598,7 @@
 
             /* strip out 'atk-bridge' and 'gail' */
             size_t PREFIX_LENGTH = strlen(ENV_PREFIX);
-            while (s = strtok(tmp_env, ":"))
+            while ((s = strtok(tmp_env, ":")))
             {
                 if ((!strstr (s, "atk-bridge")) && (!strstr (s, "gail")))
                 {
@@ -918,14 +918,14 @@
     {
         case BUTTON:
         case TABLE_HEADER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE])))
             {
                 gtk3_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)();
             }
             result = gtk3_widgets[_GTK_BUTTON_TYPE];
             break;
         case CHECK_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE])))
             {
                 gtk3_widgets[_GTK_CHECK_BUTTON_TYPE] =
                     (*fp_gtk_check_button_new)();
@@ -933,7 +933,7 @@
             result = gtk3_widgets[_GTK_CHECK_BUTTON_TYPE];
             break;
         case CHECK_BOX_MENU_ITEM:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE])))
             {
                 gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE] =
                     (*fp_gtk_check_menu_item_new)();
@@ -954,7 +954,7 @@
             result = gtk3_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE];
             break;*/
         case COMBO_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE])))
             {
                 gtk3_widgets[_GTK_COMBO_BOX_TYPE] =
                     (*fp_gtk_combo_box_new)();
@@ -962,8 +962,8 @@
             result = gtk3_widgets[_GTK_COMBO_BOX_TYPE];
             break;
         case COMBO_BOX_ARROW_BUTTON:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE])))
             {
                 gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
                      (*fp_gtk_toggle_button_new)();
@@ -971,8 +971,8 @@
             result = gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
             break;
         case COMBO_BOX_TEXT_FIELD:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE])))
             {
                 result = gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
                      (*fp_gtk_entry_new)();
@@ -982,7 +982,7 @@
         case DESKTOP_ICON:
         case INTERNAL_FRAME_TITLE_PANE:
         case LABEL:
-            if (init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE])))
             {
                 gtk3_widgets[_GTK_LABEL_TYPE] =
                     (*fp_gtk_label_new)(NULL);
@@ -992,7 +992,7 @@
         case DESKTOP_PANE:
         case PANEL:
         case ROOT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE])))
             {
                 /* There is no constructor for a container type.  I've
                  * chosen GtkFixed container since it has a default
@@ -1006,7 +1006,7 @@
         case EDITOR_PANE:
         case TEXT_AREA:
         case TEXT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE])))
             {
                 gtk3_widgets[_GTK_TEXT_VIEW_TYPE] =
                     (*fp_gtk_text_view_new)();
@@ -1016,7 +1016,7 @@
         case FORMATTED_TEXT_FIELD:
         case PASSWORD_FIELD:
         case TEXT_FIELD:
-            if (init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE])))
             {
                 gtk3_widgets[_GTK_ENTRY_TYPE] =
                     (*fp_gtk_entry_new)();
@@ -1024,7 +1024,7 @@
             result = gtk3_widgets[_GTK_ENTRY_TYPE];
             break;
         case HANDLE_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE])))
             {
                 gtk3_widgets[_GTK_HANDLE_BOX_TYPE] =
                     (*fp_gtk_handle_box_new)();
@@ -1036,7 +1036,7 @@
         case HSCROLL_BAR_BUTTON_RIGHT:
         case HSCROLL_BAR_TRACK:
         case HSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE])))
             {
                 gtk3_widgets[_GTK_HSCROLLBAR_TYPE] =
                     (*fp_gtk_hscrollbar_new)(create_adjustment());
@@ -1044,7 +1044,7 @@
             result = gtk3_widgets[_GTK_HSCROLLBAR_TYPE];
             break;
         case HSEPARATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE])))
             {
                 gtk3_widgets[_GTK_HSEPARATOR_TYPE] =
                     (*fp_gtk_hseparator_new)();
@@ -1054,7 +1054,7 @@
         case HSLIDER:
         case HSLIDER_THUMB:
         case HSLIDER_TRACK:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE])))
             {
                 gtk3_widgets[_GTK_HSCALE_TYPE] =
                     (*fp_gtk_scale_new)(GTK_ORIENTATION_HORIZONTAL, NULL);
@@ -1063,21 +1063,21 @@
             break;
         case HSPLIT_PANE_DIVIDER:
         case SPLIT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE])))
             {
                 gtk3_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)();
             }
             result = gtk3_widgets[_GTK_HPANED_TYPE];
             break;
         case IMAGE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE])))
             {
                 gtk3_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)();
             }
             result = gtk3_widgets[_GTK_IMAGE_TYPE];
             break;
         case INTERNAL_FRAME:
-            if (init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE])))
             {
                 gtk3_widgets[_GTK_WINDOW_TYPE] =
                     (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
@@ -1085,7 +1085,7 @@
             result = gtk3_widgets[_GTK_WINDOW_TYPE];
             break;
         case TOOL_TIP:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE])))
             {
                 result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
                 gtk3_widgets[_GTK_TOOLTIP_TYPE] = result;
@@ -1096,7 +1096,7 @@
         case TABLE:
         case TREE:
         case TREE_CELL:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE])))
             {
                 gtk3_widgets[_GTK_TREE_VIEW_TYPE] =
                     (*fp_gtk_tree_view_new)();
@@ -1104,14 +1104,14 @@
             result = gtk3_widgets[_GTK_TREE_VIEW_TYPE];
             break;
         case TITLED_BORDER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE])))
             {
                 gtk3_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL);
             }
             result = gtk3_widgets[_GTK_FRAME_TYPE];
             break;
         case POPUP_MENU:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE])))
             {
                 gtk3_widgets[_GTK_MENU_TYPE] =
                     (*fp_gtk_menu_new)();
@@ -1121,7 +1121,7 @@
         case MENU:
         case MENU_ITEM:
         case MENU_ITEM_ACCELERATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE])))
             {
                 gtk3_widgets[_GTK_MENU_ITEM_TYPE] =
                     (*fp_gtk_menu_item_new)();
@@ -1129,7 +1129,7 @@
             result = gtk3_widgets[_GTK_MENU_ITEM_TYPE];
             break;
         case MENU_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE])))
             {
                 gtk3_widgets[_GTK_MENU_BAR_TYPE] =
                     (*fp_gtk_menu_bar_new)();
@@ -1138,7 +1138,7 @@
             break;
         case COLOR_CHOOSER:
         case OPTION_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE])))
             {
                 gtk3_widgets[_GTK_DIALOG_TYPE] =
                     (*fp_gtk_dialog_new)();
@@ -1146,8 +1146,8 @@
             result = gtk3_widgets[_GTK_DIALOG_TYPE];
             break;
         case POPUP_MENU_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])))
             {
                 gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] =
                     (*fp_gtk_separator_menu_item_new)();
@@ -1155,7 +1155,7 @@
             result = gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE];
             break;
         case HPROGRESS_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE])))
             {
                 gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE] =
                     (*fp_gtk_progress_bar_new)();
@@ -1163,7 +1163,7 @@
             result = gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE];
             break;
         case VPROGRESS_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE])))
             {
                 gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE] =
                     (*fp_gtk_progress_bar_new)();
@@ -1178,7 +1178,7 @@
             result = gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE];
             break;
         case RADIO_BUTTON:
-            if (init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE])))
             {
                 gtk3_widgets[_GTK_RADIO_BUTTON_TYPE] =
                     (*fp_gtk_radio_button_new)(NULL);
@@ -1186,8 +1186,8 @@
             result = gtk3_widgets[_GTK_RADIO_BUTTON_TYPE];
             break;
         case RADIO_BUTTON_MENU_ITEM:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE])))
             {
                 gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE] =
                     (*fp_gtk_radio_menu_item_new)(NULL);
@@ -1195,8 +1195,8 @@
             result = gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE];
             break;
         case SCROLL_PANE:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE])))
             {
                 gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE] =
                     (*fp_gtk_scrolled_window_new)(NULL, NULL);
@@ -1206,7 +1206,7 @@
         case SPINNER:
         case SPINNER_ARROW_BUTTON:
         case SPINNER_TEXT_FIELD:
-            if (init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE])))
             {
                 result = gtk3_widgets[_GTK_SPIN_BUTTON_TYPE] =
                     (*fp_gtk_spin_button_new)(NULL, 0, 0);
@@ -1217,7 +1217,7 @@
         case TABBED_PANE_TAB_AREA:
         case TABBED_PANE_CONTENT:
         case TABBED_PANE_TAB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE])))
             {
                 gtk3_widgets[_GTK_NOTEBOOK_TYPE] =
                     (*fp_gtk_notebook_new)(NULL);
@@ -1225,7 +1225,7 @@
             result = gtk3_widgets[_GTK_NOTEBOOK_TYPE];
             break;
         case TOGGLE_BUTTON:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE])))
             {
                 gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] =
                     (*fp_gtk_toggle_button_new)(NULL);
@@ -1234,7 +1234,7 @@
             break;
         case TOOL_BAR:
         case TOOL_BAR_DRAG_WINDOW:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE])))
             {
                 gtk3_widgets[_GTK_TOOLBAR_TYPE] =
                     (*fp_gtk_toolbar_new)(NULL);
@@ -1242,8 +1242,8 @@
             result = gtk3_widgets[_GTK_TOOLBAR_TYPE];
             break;
         case TOOL_BAR_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]))
+            if ((init_result =
+                    (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])))
             {
                 gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] =
                     (*fp_gtk_separator_tool_item_new)();
@@ -1251,7 +1251,7 @@
             result = gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE];
             break;
         case VIEWPORT:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE])))
             {
                 GtkAdjustment *adjustment = create_adjustment();
                 gtk3_widgets[_GTK_VIEWPORT_TYPE] =
@@ -1264,7 +1264,7 @@
         case VSCROLL_BAR_BUTTON_DOWN:
         case VSCROLL_BAR_TRACK:
         case VSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE])))
             {
                 gtk3_widgets[_GTK_VSCROLLBAR_TYPE] =
                     (*fp_gtk_vscrollbar_new)(create_adjustment());
@@ -1272,7 +1272,7 @@
             result = gtk3_widgets[_GTK_VSCROLLBAR_TYPE];
             break;
         case VSEPARATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE])))
             {
                 gtk3_widgets[_GTK_VSEPARATOR_TYPE] =
                     (*fp_gtk_vseparator_new)();
@@ -1282,7 +1282,7 @@
         case VSLIDER:
         case VSLIDER_THUMB:
         case VSLIDER_TRACK:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE])))
             {
                 gtk3_widgets[_GTK_VSCALE_TYPE] =
                     (*fp_gtk_scale_new)(GTK_ORIENTATION_VERTICAL, NULL);
@@ -1296,7 +1296,7 @@
              fp_gtk_range_set_inverted((GtkRange*)result, TRUE);
             break;
         case VSPLIT_PANE_DIVIDER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE]))
+            if ((init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE])))
             {
                 gtk3_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)();
             }
@@ -2014,9 +2014,6 @@
 static guint8 recode_color(gdouble channel)
 {
     guint16 result = (guint16)(channel * 65535);
-    if (result > 65535) {
-        result = 65535;
-    }
     return (guint8)( result >> 8);
 }