From cea3e4736f5441df84b9eb187532347362ab73f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 2 Dec 2007 09:24:26 +0000
Subject: [PATCH] fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21904 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/support/Path.cpp | 12 +++++++-----
 src/support/Path.h   |  2 --
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/support/Path.cpp b/src/support/Path.cpp
index 8b85471c97..fbf48d8d13 100644
--- a/src/support/Path.cpp
+++ b/src/support/Path.cpp
@@ -10,14 +10,12 @@
 
 #include <config.h>
 
-// Needed to prevent the definition of the unnamed_PathChanger macro
-// in the header file.
-
-#define PATHCHANGER_C
-
 #include "support/Path.h"
 #include "support/lyxlib.h"
 
+// undef PathChanger macro when building PathChanger
+#undef PathChanger
+
 
 namespace lyx {
 namespace support {
@@ -63,3 +61,7 @@ int PathChanger::pop()
 
 } // namespace support
 } // namespace lyx
+
+
+#define PathChanger(x) unnamed_PathChanger;
+// in merged builds this is not the last line.
diff --git a/src/support/Path.h b/src/support/Path.h
index 4c3d6ba1e8..d61a47a0f3 100644
--- a/src/support/Path.h
+++ b/src/support/Path.h
@@ -56,9 +56,7 @@ private:
 // PathChanger("/tmp");   // wrong
 // PathChanger p("/tmp");  // right
 // we add this macro:
-#ifndef PATHCHANGER_C
 #define PathChanger(x) unnamed_PathChanger;
-#endif
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
 } // namespace support
-- 
2.39.5