From 41ab3bd526807e0a092466e7d4e979f12bab81ff Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 13 May 2014 21:17:06 +0200
Subject: fix windows 64bit build. (changes already committed to trunk)

(bzr r13341.1.19)
---
 src/2geom/toposweep.cpp              | 1 +
 src/libdepixelize/kopftracer2011.cpp | 4 +++-
 src/libdepixelize/kopftracer2011.h   | 1 +
 src/prefix.cpp                       | 3 ---
 src/ui/dialog/filedialogimpl-win32.h | 2 ++
 src/widgets/ege-paint-def.cpp        | 1 -
 6 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/2geom/toposweep.cpp b/src/2geom/toposweep.cpp
index cfb91857c..4da3f6922 100644
--- a/src/2geom/toposweep.cpp
+++ b/src/2geom/toposweep.cpp
@@ -53,6 +53,7 @@ TopoGraph::Edge TopoGraph::remove_edge(unsigned ix, unsigned jx) {
         }
     }
     assert(0);
+    return v[0]; // if assert is disabled, return first Edge.
 }
 
 void TopoGraph::cannonize() {
diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index e2f387c86..bbb73d445 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -26,13 +26,15 @@
 # include <config.h>
 #endif
 
+
+#include "kopftracer2011.h"
+
 // Build fix under Inkscape build tree
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
 #endif
 
 #include <algorithm>
-#include "kopftracer2011.h"
 #include "priv/colorspace.h"
 #include "priv/homogeneoussplines.h"
 #include "priv/branchless.h"
diff --git a/src/libdepixelize/kopftracer2011.h b/src/libdepixelize/kopftracer2011.h
index 598f6c79c..c60d0a61a 100644
--- a/src/libdepixelize/kopftracer2011.h
+++ b/src/libdepixelize/kopftracer2011.h
@@ -27,6 +27,7 @@
 
 #include <string>
 
+#include <glibmm.h>
 // Contains exception definitions
 #include <glibmm/fileutils.h>
 #include <gdkmm/pixbuf.h>
diff --git a/src/prefix.cpp b/src/prefix.cpp
index 99e20171f..630d6caa8 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -44,9 +44,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#undef NULL
-#define NULL ((void *) 0)
-
 #ifdef __GNUC__
     #define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;}
 #else
diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h
index 29bcb9a45..a71ee1ad0 100644
--- a/src/ui/dialog/filedialogimpl-win32.h
+++ b/src/ui/dialog/filedialogimpl-win32.h
@@ -13,6 +13,8 @@
 # include "config.h"
 #endif
 
+#include <glibmm.h>
+
 #ifdef WIN32
 #if WITH_GLIBMM_2_32
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index 542205b53..1a8ad041a 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -44,7 +44,6 @@
 #include <string>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <glibmm/i18n.h>
-- 
cgit v1.2.3