--- old/src/demo/share/jvmti/waiters/Monitor.hpp	2015-10-15 12:37:18.349794136 -0400
+++ new/src/demo/share/jvmti/waiters/Monitor.hpp	2015-10-15 12:37:17.653754991 -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,10 @@
  * this sample code.
  */
 
+#ifdef STATIC_BUILD
+#define Monitor WaiterMonitor
+#endif
+
 
 /* C++ Monitor class */