--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h Wed Jul 05 18:20:34 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h Tue Sep 11 13:40:59 2012 -0700
@@ -28,6 +28,11 @@
#define D3D_DEBUG_INFO
#endif // DEBUG
+/* Use THIS_FILE when it is available. */
+#ifndef THIS_FILE
+ #define THIS_FILE THIS_FILE
+#endif
+
#ifdef D3D_PPL_DLL
@@ -104,7 +109,7 @@
#define ACT_IF_NULL(ACTION, value) \
if ((value) == NULL) { \
J2dTraceLn3(J2D_TRACE_ERROR, \
- "%s is null in %s:%d", #value, __FILE__, __LINE__); \
+ "%s is null in %s:%d", #value, THIS_FILE, __LINE__); \
ACTION; \
} else do { } while (0)
#define RETURN_IF_NULL(value) ACT_IF_NULL(return, value)
@@ -114,12 +119,12 @@
#define RETURN_STATUS_IF_EXP_FAILED(EXPR) \
if (FAILED(res = (EXPR))) { \
- DebugPrintD3DError(res, " " ## #EXPR ## " failed in " ## __FILE__); \
+ DebugPrintD3DError(res, " " ## #EXPR ## " failed in " ## THIS_FILE); \
return res; \
} else do { } while (0)
#define RETURN_STATUS_IF_FAILED(status) \
if (FAILED((status))) { \
- DebugPrintD3DError((status), " failed in " ## __FILE__ ## ", return;");\
+ DebugPrintD3DError((status), " failed in " ## THIS_FILE ## ", return;");\
return (status); \
} else do { } while (0)