diff options
| author | ohair <none@none> | 2012-09-11 13:40:59 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2012-09-11 13:40:59 -0700 |
| commit | f9180a90452b5e1d6f387f2127ba6420c022ab32 (patch) | |
| tree | d387a42315f9426fc4bfa06c0b68ca9d439d137f /src/share/instrument | |
| parent | 8f6cf9301c92a82d4238c1f0dfbb985614342b7b (diff) | |
| download | jdk8u_jdk-f9180a90452b5e1d6f387f2127ba6420c022ab32.tar.gz | |
7197771: Adjust jdk sources to avoid use of implementation defined value of __FILE__
7180608: Sort the order of object files when building shared libraries
Reviewed-by: ohrstrom, erikj, tbell
Diffstat (limited to 'src/share/instrument')
| -rw-r--r-- | src/share/instrument/JPLISAssert.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/share/instrument/JPLISAssert.h b/src/share/instrument/JPLISAssert.h index c2ef7eef12..a0446447e5 100644 --- a/src/share/instrument/JPLISAssert.h +++ b/src/share/instrument/JPLISAssert.h @@ -49,10 +49,14 @@ extern "C" { #define JPLISASSERT_ENABLEASSERTIONS (0) #endif +/* Use THIS_FILE when it is available. */ +#ifndef THIS_FILE + #define THIS_FILE __FILE__ +#endif #if JPLISASSERT_ENABLEASSERTIONS -#define jplis_assert(x) JPLISAssertCondition((jboolean)(x), #x, __FILE__, __LINE__) -#define jplis_assert_msg(x, msg) JPLISAssertConditionWithMessage((jboolean)(x), #x, msg, __FILE__, __LINE__) +#define jplis_assert(x) JPLISAssertCondition((jboolean)(x), #x, THIS_FILE, __LINE__) +#define jplis_assert_msg(x, msg) JPLISAssertConditionWithMessage((jboolean)(x), #x, msg, THIS_FILE, __LINE__) #else #define jplis_assert(x) #define jplis_assert_msg(x, msg) |