#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 {
: popped_(false)
{
if (!path.empty()) {
- pushedDir_ = getcwd();
+ pushedDir_ = FileName::getcwd();
if (pushedDir_.empty() || !path.chdir()) {
/* FIXME: throw */
} // namespace support
} // namespace lyx
+
+
+#define PathChanger(x) unnamed_PathChanger;
+// in merged builds this is not the last line.