--- a/jdk/src/demo/share/jvmti/waiters/Thread.cpp	Thu Oct 15 14:41:37 2015 +0100
+++ b/jdk/src/demo/share/jvmti/waiters/Thread.cpp	Mon Oct 19 13:41:09 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,6 +37,9 @@
  * this sample code.
  */
 
+#ifdef STATIC_BUILD
+#define Thread WaiterThread
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>