--- old/src/java.desktop/unix/native/libawt_xawt/awt/list.h	2018-11-01 14:13:33.722337785 -0700
+++ new/src/java.desktop/unix/native/libawt_xawt/awt/list.h	2018-11-01 14:13:33.458337786 -0700
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* $XConsortium: list.h /main/4 1996/10/14 15:04:04 swick $ */
 /** ------------------------------------------------------------------------
         This file contains routines for manipulating generic lists.
         Lists are implemented with a "harness".  In other words, each
@@ -36,16 +36,14 @@
  However, the following notice accompanied the original version of this
  file:
 
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996  X Consortium
+Copyright 1994 Hewlett-Packard Co.
+Copyright 1996, 1998  The Open Group
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
@@ -53,23 +51,22 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 
     -------------------------------------------------------------------- **/
 
-#include "gdefs.h"
-
 #ifndef LIST_DEF
 #define LIST_DEF
 
+#include <X11/Xfuncproto.h>
 #define LESS    -1
 #define EQUAL   0
 #define GREATER 1
@@ -85,65 +82,41 @@
 } list, list_item, *list_ptr;
 
 typedef void (*DESTRUCT_FUNC_PTR)(
-#if NeedFunctionPrototypes
 void *
-#endif
 );
 
 void zero_list(
-#if NeedFunctionPrototypes
           list_ptr
-#endif
     );
-int32_t add_to_list (
-#if NeedFunctionPrototypes
+int add_to_list (
           list_ptr , void *
-#endif
     );
 list_ptr new_list (
-#if NeedFunctionPrototypes
           void
-#endif
     );
 list_ptr dup_list_head (
-#if NeedFunctionPrototypes
-          list_ptr , int32_t
-#endif
+          list_ptr , int
     );
-uint32_t list_length(
-#if NeedFunctionPrototypes
+unsigned int list_length(
           list_ptr
-#endif
     );
 void *delete_from_list (
-#if NeedFunctionPrototypes
           list_ptr , void *
-#endif
     );
 void delete_list(
-#if NeedFunctionPrototypes
-          list_ptr , int32_t
-#endif
+          list_ptr , int
     );
 void delete_list_destroying (
-#if NeedFunctionPrototypes
           list_ptr , DESTRUCT_FUNC_PTR
-#endif
     );
 void *first_in_list (
-#if NeedFunctionPrototypes
           list_ptr
-#endif
     );
 void *next_in_list (
-#if NeedFunctionPrototypes
           list_ptr
-#endif
     );
-int32_t list_is_empty (
-#if NeedFunctionPrototypes
+int list_is_empty (
           list_ptr
-#endif
     );
 
 #endif