.

wcfs/internal/wcfs_misc.h

@@ -22,6 +22,12 @@
 #ifndef _NXD_WCFS_MISC_H_
 #define _NXD_WCFS_MISC_H_
 
+// XXX hack: C++ does not have __builtin_types_compatible_p, but CCAN configure
+// thinks it does because CCAN is configired via C, not C++.
+#include <config.h>
+#undef  HAVE_BUILTIN_TYPES_COMPATIBLE_P
+#define HAVE_BUILTIN_TYPES_COMPATIBLE_P 0
+
 #include <stddef.h>
 #include <stdint.h>
 

wcfs/internal/wcfs_virtmem.cpp

@@ -24,12 +24,6 @@
 #include <golang/libgolang.h>
 using namespace golang;
 
-// XXX hack: C++ does not have __builtin_types_compatible_p, but CCAN configure
-// thinks it does because CCAN is configired via C, not C++.
-#include <config.h>
-#undef  HAVE_BUILTIN_TYPES_COMPATIBLE_P
-#define HAVE_BUILTIN_TYPES_COMPATIBLE_P 0
-
 #include <wendelin/bigfile/virtmem.h>
 #include <wendelin/bigfile/ram.h>
 //#include <wendelin/bug.h>

wcfs/internal/wcfs_watchlink.cpp

@@ -20,6 +20,9 @@
 #include "wcfs.h"
 #include "wcfs_watchlink.h"
 
+#include <string.h>
+
+
 // _openwatch opens new watch link on wcfs.
 tuple<WatchLink*, error> WCFS::_openwatch() {
     WCFS *wc = this;