[ros-diffs] [sginsberg] 69214: Define __RELFILE__ the same for an -O0 build so the tests don't get edgy when comparing it to our optimized builds.

Author: sginsberg
Date: Sun Sep 13 11:08:16 2015
New Revision: 69214

URL: http://svn.reactos.org/svn/reactos?rev=69214&view=rev
Log:
Define __RELFILE__ the same for an -O0 build so the tests don't get edgy when comparing it to our optimized builds.

Modified:
    trunk/reactos/include/reactos/builddir.h.cmake
    trunk/reactos/include/reactos/debug.h
    trunk/reactos/include/reactos/wine/debug.h

Modified: trunk/reactos/include/reactos/builddir.h.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/builddir.h....
==============================================================================
--- trunk/reactos/include/reactos/builddir.h.cmake	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/builddir.h.cmake	[iso-8859-1] Sun Sep 13 11:08:16 2015
@@ -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 */

Modified: trunk/reactos/include/reactos/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?rev...
==============================================================================
--- trunk/reactos/include/reactos/debug.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/debug.h	[iso-8859-1] Sun Sep 13 11:08:16 2015
@@ -15,10 +15,6 @@
 #pragma once

#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_)

Modified: trunk/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug....
==============================================================================
--- trunk/reactos/include/reactos/wine/debug.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/debug.h	[iso-8859-1] Sun Sep 13 11:08:16 2015
@@ -28,10 +28,6 @@
 #endif

#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