--- a/src/simulator/cairo-wideint-private.h	Mon Dec 04 07:33:45 2006 +0100
+++ b/src/simulator/cairo-wideint-private.h	Mon Dec 04 08:03:28 2006 +0100
@@ -32,6 +32,9 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H
 
+#include "ns3/simulator-config.h"
+#define cairo_private 
+
 #if   HAVE_STDINT_H
 # include <stdint.h>
 #elif HAVE_INTTYPES_H
@@ -63,6 +66,10 @@
 #error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * 64-bit datatypes.  Two separate implementations, one using
  * built-in 64-bit signed/unsigned types another implemented
@@ -313,4 +320,9 @@
 
 #undef I
 
+#ifdef __cplusplus
+};
+#endif
+
+
 #endif /* CAIRO_WIDEINT_H */