diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-03-05 22:44:33 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-03-05 22:44:33 +0000 |
| commit | 378a6384e55bdb8c5750c051fd91302f64d2b69a (patch) | |
| tree | d78d65188aeda19ebf39240d7272f1c6ec64ce6c /src/main.cpp | |
| parent | Unordered containers build fix for Windows (diff) | |
| download | inkscape-378a6384e55bdb8c5750c051fd91302f64d2b69a.tar.gz inkscape-378a6384e55bdb8c5750c051fd91302f64d2b69a.zip | |
Patch from Fridrich - LP #520532
Fixed bugs:
- https://launchpad.net/bugs/520532
(bzr r9149)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index f55731be8..d11222203 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,6 +56,10 @@ #include "gc-core.h" +#ifdef AND +#undef AND +#endif + #include "macros.h" #include "file.h" #include "document.h" @@ -94,14 +98,9 @@ #include <extension/input.h> #ifdef WIN32 -//#define REPLACEARGS_ANSI -//#define REPLACEARGS_DEBUG - #include "registrytool.h" - #include "extension/internal/win32.h" using Inkscape::Extension::Internal::PrintWin32; - #endif // WIN32 #include "extension/init.h" |