From 378a6384e55bdb8c5750c051fd91302f64d2b69a Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Fri, 5 Mar 2010 23:44:33 +0100
Subject: Patch from Fridrich - LP #520532

Fixed bugs:
  - https://launchpad.net/bugs/520532

(bzr r9149)
---
 src/main.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/main.cpp')

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"
-- 
cgit v1.2.3