From 4b4ee8f9a4c64c065a5ebd9672f2d86b528bac7f Mon Sep 17 00:00:00 2001 From: Nige Date: Tue, 25 Jun 2019 18:08:23 -0400 Subject: [PATCH 1/2] Forcing line ending strategy consistency across platforms --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e287079 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Unifying line endings so tests can pass on Windows +*.json text eol=lf \ No newline at end of file From 3d5d926dbbb2ef7e39cf88c1bf47d0407002067b Mon Sep 17 00:00:00 2001 From: Nige Date: Tue, 25 Jun 2019 18:26:42 -0400 Subject: [PATCH 2/2] Fixing the build and tests for VS2019 --- .gitignore | 4 ++++ c_src/termstack.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index c6154b9..942bbee 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,10 @@ *.d *.o *.so +*.pdb +*.dll +*.exp +*.lib _build compile_commands.json deps diff --git a/c_src/termstack.c b/c_src/termstack.c index a558b0a..a5d6425 100644 --- a/c_src/termstack.c +++ b/c_src/termstack.c @@ -8,6 +8,10 @@ #include "jiffy.h" #include "termstack.h" +#if WINDOWS || WIN32 +#define inline +#endif + ERL_NIF_TERM termstack_save(ErlNifEnv* env, TermStack* stack) {