summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjwybrow <mjwybrow@users.sourceforge.net>2006-05-04 05:54:06 +0000
committermjwybrow <mjwybrow@users.sourceforge.net>2006-05-04 05:54:06 +0000
commit977f18021b64dc05e332cd4a41068fdecbf2103c (patch)
tree417475aaed5a3a23a1b750623d1f42cad06ebef5
parentfixed compilation errors with HAVE_SSL (diff)
downloadinkscape-977f18021b64dc05e332cd4a41068fdecbf2103c.tar.gz
inkscape-977f18021b64dc05e332cd4a41068fdecbf2103c.zip
* src/jabber_whiteboard/pedrodom.cpp: Compile fix for Mac OS.
(bzr r722)
-rw-r--r--ChangeLog2
-rw-r--r--src/jabber_whiteboard/pedrodom.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e21c91b3..66b0310cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2006-05-03 Michael Wybrow <mjwybrow@users.sourceforge.net>
* po/pt_BR.po: Fix some "Unmatched closing </b>" warnings.
+
+ * src/jabber_whiteboard/pedrodom.cpp: Compile fix for Mac OS.
2006-05-03 Carl Hetherington <inkscape@carlh.net>
diff --git a/src/jabber_whiteboard/pedrodom.cpp b/src/jabber_whiteboard/pedrodom.cpp
index 5ac4a61d0..903c159ec 100644
--- a/src/jabber_whiteboard/pedrodom.cpp
+++ b/src/jabber_whiteboard/pedrodom.cpp
@@ -22,11 +22,13 @@
*/
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include <malloc.h>
#include <sys/types.h>
#include <sys/stat.h>