Merge remote-tracking branch 'refs/remotes/origin/windows2' into complete
# Conflicts:
# .gitignore
# include/cn-cbor/cn-cbor.h
# src/cn-encoder.c
diff --git a/.gitignore b/.gitignore
index a238631..dc37cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,19 +3,21 @@
*.o
build
-# Files from Visual Studio Builds
-Debug
-Release
-
-# Files from emacs
+# Emacs temp files
*~
.#*
*#
-# files from cmake
+# Visual Stdio build directories
+Debug
+Release
*.vcxproj
*.vcxproj.filters
*.vcxproj.user
-CMakeFiles
+
+# Output of CMake
CMakeCache.txt
+CMakeFiles
+Makefile
*.cmake
+install_manifest.txt
diff --git a/src/cbor.h b/src/cbor.h
index 1859f09..6329477 100644
--- a/src/cbor.h
+++ b/src/cbor.h
@@ -1,6 +1,10 @@
#ifndef CBOR_PROTOCOL_H__
#define CBOR_PROTOCOL_H__
+#ifdef _MSC_VER
+#define inline _inline
+#endif
+
/* The 8 major types */
#define MT_UNSIGNED 0
#define MT_NEGATIVE 1
diff --git a/src/cn-encoder.c b/src/cn-encoder.c
index ab89a3a..f5e4207 100644
--- a/src/cn-encoder.c
+++ b/src/cn-encoder.c
@@ -13,7 +13,9 @@
#define inline _inline
#else
#include <arpa/inet.h>
+#endif
#include <string.h>
+#ifndef _MSC_VER
#include <strings.h>
#endif
#include <stdbool.h>
