aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraybe <aybe.one@hotmail.com>2019-11-23 10:20:18 +0100
committeraybe <aybe.one@hotmail.com>2019-11-23 10:20:18 +0100
commit1f49837376431887067f9bd22c10b389b8fbd018 (patch)
tree3434817771ad39941c10a991177039de37702883
parent7ca7db5285a628ef7be3661f5a152c1ab7168bf4 (diff)
downloadvcpkg-1f49837376431887067f9bd22c10b389b8fbd018.tar.gz
vcpkg-1f49837376431887067f9bd22c10b389b8fbd018.zip
[libmodplug] use static cast for ctype
-rw-r--r--ports/libmodplug/003-use-static-cast-for-ctype.patch14
-rw-r--r--ports/libmodplug/CONTROL2
-rw-r--r--ports/libmodplug/portfile.cmake2
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/libmodplug/003-use-static-cast-for-ctype.patch b/ports/libmodplug/003-use-static-cast-for-ctype.patch
new file mode 100644
index 000000000..2054e8a44
--- /dev/null
+++ b/ports/libmodplug/003-use-static-cast-for-ctype.patch
@@ -0,0 +1,14 @@
+diff --git a/src/load_abc.cpp b/src/load_abc.cpp
+index ee79f39..874ab8f 100644
+--- a/src/load_abc.cpp
++++ b/src/load_abc.cpp
+@@ -268,7 +268,8 @@ static void setenv(const char *name, const char *value, int overwrite)
+ #endif
+
+ static int abc_isvalidchar(char c) {
+- return(isalpha(c) || isdigit(c) || isspace(c) || c == '%' || c == ':');
++ unsigned char u = static_cast<unsigned char>(c);
++ return(isalpha(u) || isdigit(u) || isspace(u) || c == '%' || c == ':');
+ }
+ #if 0
+ static const char *abc_skipspace(const char *p)
diff --git a/ports/libmodplug/CONTROL b/ports/libmodplug/CONTROL
index c486d4eb9..7fd84e775 100644
--- a/ports/libmodplug/CONTROL
+++ b/ports/libmodplug/CONTROL
@@ -1,4 +1,4 @@
Source: libmodplug
-Version: 0.8.9.0-4
+Version: 0.8.9.0-5
Homepage: https://github.com/Konstanty/libmodplug
Description: The ModPlug mod file playing library.
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
index 01b1081d6..74dcfa264 100644
--- a/ports/libmodplug/portfile.cmake
+++ b/ports/libmodplug/portfile.cmake
@@ -11,6 +11,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
PATCHES
"001-automagically-define-modplug-static.patch"
"002-detect_sinf.patch"
+ "003-use-static-cast-for-ctype.patch"
)
else()
vcpkg_from_github(ARCHIVE
@@ -20,6 +21,7 @@ else()
SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
PATCHES
"002-detect_sinf.patch"
+ "003-use-static-cast-for-ctype.patch"
)
endif()