--- a/hotspot/src/os/posix/vm/vmError_posix.cpp	Mon Jul 25 18:52:59 2016 +0000
+++ b/hotspot/src/os/posix/vm/vmError_posix.cpp	Wed Jul 13 12:23:05 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -33,17 +33,17 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#ifdef TARGET_OS_FAMILY_linux
+#ifdef LINUX
 #include <sys/syscall.h>
 #include <unistd.h>
 #endif
-#ifdef TARGET_OS_FAMILY_solaris
+#ifdef SOLARIS
 #include <thread.h>
 #endif
-#ifdef TARGET_OS_FAMILY_aix
+#ifdef AIX
 #include <unistd.h>
 #endif
-#ifdef TARGET_OS_FAMILY_bsd
+#ifdef BSD
 #include <sys/syscall.h>
 #include <unistd.h>
 #endif