# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1443700530 25200
# Node ID d6f8d1ffcff0355170d5062d7f563ce7105d5e50
# Parent  d06159da32c7514615da9dc5c776526e0f47e163
JDK-8047382

diff -r d06159da32c7 -r d6f8d1ffcff0 src/share/vm/oops/instanceKlass.cpp
--- a/src/share/vm/oops/instanceKlass.cpp	Wed Sep 30 12:21:44 2015 +0200
+++ b/src/share/vm/oops/instanceKlass.cpp	Thu Oct 01 04:55:30 2015 -0700
@@ -114,7 +114,7 @@
       len = name->utf8_length();                                 \
     }                                                            \
     HS_DTRACE_PROBE4(hotspot, class__initialization__##type,     \
-      data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type);           \
+      data, len, (void *)(clss)->class_loader(), thread_type);           \
   }
 
 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
@@ -127,7 +127,7 @@
       len = name->utf8_length();                                 \
     }                                                            \
     HS_DTRACE_PROBE5(hotspot, class__initialization__##type,     \
-      data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait);     \
+      data, len, (void *)(clss)->class_loader(), thread_type, wait);     \
   }
 #else /* USDT2 */
 
diff -r d06159da32c7 -r d6f8d1ffcff0 src/share/vm/services/classLoadingService.cpp
--- a/src/share/vm/services/classLoadingService.cpp	Wed Sep 30 12:21:44 2015 +0200
+++ b/src/share/vm/services/classLoadingService.cpp	Thu Oct 01 04:55:30 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -52,7 +52,7 @@
       len = name->utf8_length();                    \
     }                                               \
     HS_DTRACE_PROBE4(hotspot, class__##type,        \
-      data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \
+      data, len, (void *)(clss)->class_loader(), (shared)); \
   }
 
 #else /* USDT2 */