summaryrefslogtreecommitdiffstats
path: root/src/prefix.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-05-13 19:17:06 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-05-13 19:17:06 +0000
commit41ab3bd526807e0a092466e7d4e979f12bab81ff (patch)
tree681f9f728429007fc5401e1f164dd87c53ec886f /src/prefix.cpp
parentremove two duplicate copies from build.xml (diff)
downloadinkscape-41ab3bd526807e0a092466e7d4e979f12bab81ff.tar.gz
inkscape-41ab3bd526807e0a092466e7d4e979f12bab81ff.zip
fix windows 64bit build. (changes already committed to trunk)
(bzr r13341.1.19)
Diffstat (limited to 'src/prefix.cpp')
-rw-r--r--src/prefix.cpp3
1 files changed, 0 insertions, 3 deletions
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