Changeset: db77a12fc5e9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db77a12fc5e9 Modified Files: common/stream/stream.c tools/embedded/build-on-windows.bat Branch: Jun2016 Log Message:
Only use byte swapping intrinsics when compiling with Visual Studio and not when using MinGW to avoid compilation warnings on 32 bit R diffs (22 lines): diff --git a/common/stream/stream.c b/common/stream/stream.c --- a/common/stream/stream.c +++ b/common/stream/stream.c @@ -128,7 +128,7 @@ #define UTF8BOM "\xEF\xBB\xBF" /* UTF-8 encoding of Unicode BOM */ #define UTF8BOMLENGTH 3 /* length of above */ -#ifdef WIN32 +#ifdef _MSC_VER /* use intrinsic functions on Windows */ #define short_int_SWAP(s) ((short) _byteswap_ushort((unsigned short) (s))) /* on Windows, long is the same size as int */ diff --git a/tools/embedded/build-on-windows.bat b/tools/embedded/build-on-windows.bat --- a/tools/embedded/build-on-windows.bat +++ b/tools/embedded/build-on-windows.bat @@ -1,5 +1,5 @@ rm MonetDBLite_0.2.2.zip "c:\Program Files (x86)\GnuWin32\bin\wget.exe" http://dev.monetdb.org/Assets/R/MonetDBLite_0.2.2.tar.gz -"c:\Program Files\R\R-3.2.4revised\bin\R" CMD INSTALL --build --merge-multiarch MonetDBLite_0.2.2.tar.gz +"c:\Program Files\R\R-3.2.5\bin\R" CMD INSTALL --build --merge-multiarch MonetDBLite_0.2.2.tar.gz rm MonetDBLite_0.2.2.tar.gz pause _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
