fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21904 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/Path.cpp b/src/support/Path.cpp
index 8b85471c979dd93f2726f37d4fa37c55293236ba..fbf48d8d1371568e5a8d019d48a5ff1d24bdc391 100644 (file)
--- 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 4c3d6ba1e8546ed92ca0d551703df3a46f246e21..d61a47a0f394fde1111b65565dc6368d1019780f 100644 (file)
--- 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