--- old/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c	2020-03-02 01:42:25.477664400 -0800
+++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c	2020-03-02 01:42:25.057570200 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, 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
@@ -86,7 +86,6 @@
 extern jobject currentX11InputMethodInstance;
 extern Boolean awt_x11inputmethod_lookupString(XKeyPressedEvent *, KeySym *);
 Boolean awt_UseType4Patch = False;
-/* how about HEADLESS */
 Boolean awt_ServerDetected = False;
 Boolean awt_XKBDetected = False;
 Boolean awt_IsXsun = False;
@@ -906,7 +905,7 @@
 {
     KeySym originalKeysym = *keysym;
 
-#if !defined(__linux__) && !defined(MACOSX)
+#if !defined(__linux__)
     /* The following code on Linux will cause the keypad keys
      * not to echo on JTextField when the NumLock is on. The
      * keysyms will be 0, because the last parameter 2 is not defined.