Define __RELFILE__ the same for an -O0 build so the tests don't get edgy when compari...

svn path=/trunk/; revision=69214

diff --git a/reactos/include/reactos/builddir.h.cmake b/reactos/include/reactos/builddir.h.cmake
index 25c0879..1e94f39 100644 (file)
--- a/reactos/include/reactos/builddir.h.cmake
+++ b/reactos/include/reactos/builddir.h.cmake
@@ -5,10 +5,12 @@
 #define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@"
 #define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@"
 
-#if defined(__GNUC__) && defined(__OPTIMIZE__)
+#if defined(__GNUC__)
 #define __RELFILE__ \
     (!__builtin_strncmp(__FILE__, REACTOS_SOURCE_DIR, sizeof(REACTOS_SOURCE_DIR) - 1) \
      ? __FILE__ + sizeof(REACTOS_SOURCE_DIR) : __FILE__)
+#else
+#define __RELFILE__ __FILE__
 #endif
 
 /* EOF */

diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h
index e766b96..2d1b475 100644 (file)
--- a/reactos/include/reactos/debug.h
+++ b/reactos/include/reactos/debug.h
@@ -16,10 +16,6 @@
 
 #include <builddir.h>
 
-#if !defined(__RELFILE__)
-#define __RELFILE__ __FILE__
-#endif
-
 /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
 #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_)
 

diff --git a/reactos/include/reactos/wine/debug.h b/reactos/include/reactos/wine/debug.h
index 16ef3f9..d3aad14 100644 (file)
--- a/reactos/include/reactos/wine/debug.h
+++ b/reactos/include/reactos/wine/debug.h
@@ -29,10 +29,6 @@
 
 #include <builddir.h>
 
-#if !defined(__RELFILE__)
-#define __RELFILE__ __FILE__
-#endif
-
 #ifdef __WINE_WINE_TEST_H
 #error This file should not be used in Wine tests
 #endif