[fltk] fix narrowing error in clang-cl (#29995)

* [fltk] fix narrowing error in clang-cl

* v db
This commit is contained in:
Alexander Neumann 2023-03-20 09:22:38 +01:00 committed by GitHub
parent e12d82b8eb
commit 391313b9de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
index 4646fe5..3b7f693 100644
--- a/fluid/ExternalCodeEditor_WIN32.cxx
+++ b/fluid/ExternalCodeEditor_WIN32.cxx
@@ -474,7 +474,7 @@ void ExternalCodeEditor::reap_cleanup() {
int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) {
if ( pid_reaped ) *pid_reaped = 0;
if ( !is_editing() ) return -2;
- int err;
+ DWORD err;
DWORD msecs_wait = 50; // .05 sec
switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
case WAIT_TIMEOUT: { // process didn't reap, still running

View File

@ -12,6 +12,7 @@ vcpkg_from_github(
include.patch
fix-system-link.patch
math-h-polyfill.patch
fix-narrow.patch
)
file(REMOVE_RECURSE
"${SOURCE_PATH}/jpeg"

View File

@ -1,7 +1,7 @@
{
"name": "fltk",
"version": "1.3.8",
"port-version": 4,
"port-version": 5,
"description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
"homepage": "https://www.fltk.org/",
"license": null,

View File

@ -2486,7 +2486,7 @@
},
"fltk": {
"baseline": "1.3.8",
"port-version": 4
"port-version": 5
},
"fluidlite": {
"baseline": "2020-08-27",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bb00fc235046a91ebcdb47e9bcb4474b82cb81d8",
"version": "1.3.8",
"port-version": 5
},
{
"git-tree": "20def1217e8d9ac6306e900f9bdc5662bf593d82",
"version": "1.3.8",