Merge branch 'windows' of https://github.com/Kawzeg/libfreenect for pull request #564

Reviewed-by: Benn Snyder <[email protected]>

Author: piedar

examples/chunkview.c

@@ -30,7 +30,9 @@
 #include <string.h>
 #include <assert.h>
 #include "libfreenect.h"
-
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 
 #if defined(__APPLE__)

examples/glview.c

@@ -31,6 +31,9 @@
 #include <assert.h>
 #include "libfreenect.h"
 
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 
 #if defined(__APPLE__)

examples/hiview.c

@@ -31,6 +31,9 @@
 #include <assert.h>
 #include "libfreenect.h"
 
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 
 #if defined(__APPLE__)

examples/micview.c

@@ -29,6 +29,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 
 #if defined(__APPLE__)

examples/regview.c

@@ -31,6 +31,9 @@
 #include <assert.h>
 #include "libfreenect.h"
 
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 #include <math.h>
 

fakenect/fakenect.c

@@ -540,7 +540,7 @@ int freenect_init(freenect_context **ctx, freenect_usb_context *usb_ctx)
 	char *var = getenv("FAKENECT_LOOP");
 	if (var) {
 		int len = strlen(var);
-		char tmp[len + 1];
+		char* tmp = malloc((len + 1) * sizeof(char));
 		int i;
 		for (i = 0; i < len; i++)
 			tmp[i] = tolower(var[i]);
@@ -551,6 +551,7 @@ int freenect_init(freenect_context **ctx, freenect_usb_context *usb_ctx)
 		    strcmp(tmp, "off") == 0) {
 			loop_playback = false;
 		}
+		free (tmp);
 	}
 
 	*ctx = fake_ctx;

wrappers/cpp/cpp_pc_view.cpp

@@ -27,7 +27,6 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
-#include <pthread.h>
 #include <libfreenect.hpp>
 
 #if defined(__APPLE__)

wrappers/cpp/cppview.cpp

@@ -24,9 +24,7 @@
  * either License.
  */
 
-
 #include "libfreenect.hpp"
-#include <pthread.h>
 #include <stdio.h>
 #include <iostream>
 #include <string.h>

wrappers/cpp/libfreenect.hpp

@@ -29,6 +29,9 @@
 #include <stdexcept>
 #include <sstream>
 #include <map>
+#ifdef _MSC_VER
+#define HAVE_STRUCT_TIMESPEC
+#endif
 #include <pthread.h>
 #include <libusb.h>