diff -r 8c73d2a46ba9 -r bf4c808a4488 src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
--- a/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template	Wed Aug 21 12:34:37 2019 -0700
+++ b/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template	Wed Aug 21 13:49:16 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -41,9 +41,9 @@
 #if !defined(SO_REUSEPORT)
 #ifdef _WIN32
 #define SO_REUSEPORT 0
-#elif __linux__
+#elif defined(__linux__)
 #define SO_REUSEPORT 15
-#elif __solaris__
+#elif defined(__solaris__)
 #define SO_REUSEPORT 0x100e
 #elif defined(AIX) || defined(MACOSX)
 #define SO_REUSEPORT 0x0200