anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21904 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-12-02 09:24:26 +00:00
parent aef7e129e7
commit cea3e4736f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/support/Path.cpp
View File

@ -10,14 +10,12 @@
#include <config.h> #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/Path.h"
#include "support/lyxlib.h" #include "support/lyxlib.h"
// undef PathChanger macro when building PathChanger
#undef PathChanger
namespace lyx { namespace lyx {
namespace support { namespace support {
@ -63,3 +61,7 @@ int PathChanger::pop()
} // namespace support } // namespace support
} // namespace lyx } // namespace lyx
#define PathChanger(x) unnamed_PathChanger;
// in merged builds this is not the last line.

2
src/support/Path.h
View File

@ -56,9 +56,7 @@ private:
// PathChanger("/tmp"); // wrong // PathChanger("/tmp"); // wrong
// PathChanger p("/tmp"); // right // PathChanger p("/tmp"); // right
// we add this macro: // we add this macro:
#ifndef PATHCHANGER_C
#define PathChanger(x) unnamed_PathChanger; #define PathChanger(x) unnamed_PathChanger;
#endif
// Tip gotten from Bobby Schmidt's column in C/C++ Users Journal // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
} // namespace support } // namespace support