Fixes for Windows

jeroen · Dec 8, 2015 · f5fe4d6 · f5fe4d6
1 parent 03c9cc9
commit f5fe4d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/mongolite.Rproj b/mongolite.Rproj
@@ -17,5 +17,5 @@ StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
-PackageInstallArgs: --with-keep.source --install-tests
+PackageInstallArgs: --with-keep.source --install-tests --no-multiarch
 PackageRoxygenize: rd,namespace
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,4 +1,5 @@
-PKG_CPPFLAGS=-I. -Iyajl -Ibson -Imongoc @cflags@ -DBSON_COMPILATION -DMONGOC_COMPILATION
+PKG_CPPFLAGS=-I. -Iyajl -Ibson -Imongoc @cflags@ -DBSON_COMPILATION -DMONGOC_COMPILATION \
+  -DBSON_EXTRA_ALIGN
 
 LIBYAJL=yajl/yajl_alloc.o yajl/yajl_buf.o yajl/yajl_encode.o yajl/yajl_gen.o \
 	yajl/yajl_lex.o yajl/yajl_parser.o yajl/yajl_tree.o yajl/yajl_version.o \

diff --git a/src/bson/bson-config.h b/src/bson/bson-config.h
@@ -112,11 +112,11 @@
 
 /*
 * Define to 1 if you want extra aligned types in libbson
+* Moved to this in Makevars because it doesn't work well with mingw
+* #if BSON_EXTRA_ALIGN != 1
+* # undef BSON_EXTRA_ALIGN
+* #endif
 */
-#define BSON_EXTRA_ALIGN 1
-#if BSON_EXTRA_ALIGN != 1
-# undef BSON_EXTRA_ALIGN
-#endif