From ee734162229f9fdfe6d8d45387ffa1004cd48ff7 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Fri, 22 Jul 2016 17:28:00 -0400 Subject: [PATCH 1/4] appveyor: fixup version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 85cee6a3..e0ee99c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.14.{branch}-{build} +version: 2.1.16.{branch}-{build} os: MinGW environment: From 82fad646e785c8de8841c8fe1590ab3b1116c785 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sat, 23 Jul 2016 23:02:10 -0400 Subject: [PATCH 2/4] wad and lumps are unsigned, not signed --- src/r_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_data.h b/src/r_data.h index 4a37f82c..69a2882a 100644 --- a/src/r_data.h +++ b/src/r_data.h @@ -30,7 +30,7 @@ typedef struct { // Block origin (always UL), which has already accounted for the internal origin of the patch. INT16 originx, originy; - INT16 wad, lump; + UINT16 wad, lump; } texpatch_t; // A maptexturedef_t describes a rectangular texture, From ddce305c178395e7a4ea86c402919f239710ba6d Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sat, 23 Jul 2016 23:14:24 -0400 Subject: [PATCH 3/4] under clang, defined does not means true --- src/lzf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lzf.c b/src/lzf.c index 33a1b2dc..d5b502b5 100644 --- a/src/lzf.c +++ b/src/lzf.c @@ -59,7 +59,9 @@ * Unconditionally aligning does not cost very much, so do it if unsure */ #ifndef STRICT_ALIGN -# define STRICT_ALIGN !(defined(__i386) || defined (__amd64)) || defined (__clang__) +#if !(defined(__i386) || defined (__amd64)) || defined (__clang__) +#define STRICT_ALIGN 1 +#endif #endif /* From 03ddc1f29ae29c3a50b56d1d4b9b1c0e43e23a3d Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sat, 23 Jul 2016 23:26:08 -0400 Subject: [PATCH 4/4] define SRTICT_ALIGN to - if the system is x86/x64 system --- src/lzf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lzf.c b/src/lzf.c index d5b502b5..272174f3 100644 --- a/src/lzf.c +++ b/src/lzf.c @@ -61,6 +61,8 @@ #ifndef STRICT_ALIGN #if !(defined(__i386) || defined (__amd64)) || defined (__clang__) #define STRICT_ALIGN 1 +#else +#define STRICT_ALIGN 0 #endif #endif