fixes to the Windows build

Author: chearon

src/Canvas.cc

@@ -4,16 +4,17 @@
 // Copyright (c) 2010 LearnBoost <[email protected]>
 //
 
-#include "Canvas.h"
-#include "PNG.h"
-#include "CanvasRenderingContext2d.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <node_buffer.h>
 #include <node_version.h>
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
+
+#include "Canvas.h"
+#include "PNG.h"
+#include "CanvasRenderingContext2d.h"
 #include "closure.h"
 
 #ifdef HAVE_JPEG

src/Canvas.h

@@ -8,16 +8,16 @@
 #ifndef __NODE_CANVAS_H__
 #define __NODE_CANVAS_H__
 
-#include <v8.h>
 #include <node.h>
+#include <v8.h>
 #include <node_object_wrap.h>
 #include <node_version.h>
 #include <pango/pangocairo.h>
 #include <cairo.h>
 #include <nan.h>
 
-using namespace v8;
 using namespace node;
+using namespace v8;
 
 /*
  * Maxmimum states per context.

src/CanvasRenderingContext2d.cc

@@ -6,11 +6,11 @@
 //
 
 #include <math.h>
-#include <string.h>
 #include <stdlib.h>
 #include <limits>
 #include <vector>
 #include <algorithm>
+
 #include "Canvas.h"
 #include "Point.h"
 #include "Image.h"
@@ -32,6 +32,28 @@
 
 Nan::Persistent<FunctionTemplate> Context2d::constructor;
 
+/*
+ * Custom strndup since Windows doesn't have it
+ */
+static char*
+_strndup(const char *s, size_t n) {
+  size_t i;
+  const char *p = s;
+  char *ret = NULL;
+
+  for (i = 0; i < n && *p; i++, p++)
+    ;
+
+  ret = (char*)malloc(i + 1);
+
+  if (ret) {
+    memcpy(ret, s, i);
+    ret[i] = '\0';
+  }
+
+  return ret;
+}
+
 /*
  * Rectangle arg assertions.
  */
@@ -65,7 +87,7 @@ enum {
 
 void state_assign_fontFamily(canvas_state_t *state, const char *str) {
   free(state->fontFamily);
-  state->fontFamily = strndup(str, 100);
+  state->fontFamily = _strndup(str, 100);
 }