--- a/hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Apr 17 22:50:10 2015 -0400
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp	Mon Apr 20 21:32:28 2015 -0400
@@ -1185,12 +1185,18 @@
   guarantee(retval != 0, "just checking");
   return retval;
 
-#elif __FreeBSD__
+#else
+  #ifdef __FreeBSD__
   retval = syscall(SYS_thr_self);
-#elif __OpenBSD__
+  #else
+    #ifdef __OpenBSD__
   retval = syscall(SYS_getthrid);
-#elif __NetBSD__
+    #else
+      #ifdef __NetBSD__
   retval = (pid_t) syscall(SYS__lwp_self);
+      #endif
+    #endif
+  #endif
 #endif
 
   if (retval == -1) {