9c9b3bb6d1
pkgsrc changes:
---------------
* Fix building of FreeBSD by adding -lpthread to LDFLAGS and by disabling
call to X11_ErrorHandlerInstall.
upstream changes:
-----------------
* 0.84.3: https://dosbox-x.com/release-0.84.3.html
* 0.84.2: https://dosbox-x.com/release-0.84.2.html
* 0.84.1: https://dosbox-x.com/release-0.84.1.html
* 0.84.0: https://dosbox-x.com/release-0.84.0.html
21 lines
999 B
C++
21 lines
999 B
C++
$NetBSD: patch-src_dos_dos__programs.cpp,v 1.5 2022/11/06 21:31:57 triaxx Exp $
|
|
|
|
dos_programs.cpp: In member function 'bool AUTOTYPE::ReadDoubleArg(const string&, const char*, const double&, const double&, const double&, double&)':
|
|
dos_programs.cpp:5556:12: error: expected unqualified-id before '(' token
|
|
if (std::isfinite(user_value)) {
|
|
|
|
--- src/dos/dos_programs.cpp.orig 2022-03-01 02:12:39.000000000 +0000
|
|
+++ src/dos/dos_programs.cpp
|
|
@@ -6935,11 +6935,7 @@ bool AUTOTYPE::ReadDoubleArg(const std::
|
|
if (cmd->FindString(flag, str_value, true)) {
|
|
// Can the user's value be parsed?
|
|
const double user_value = to_finite<double>(str_value);
|
|
-#if defined(__FreeBSD__) || defined(MACOSX) || defined(EMSCRIPTEN) || ((defined(ANDROID) || defined(__ANDROID__)) && defined(__clang__))
|
|
- if (isfinite(user_value)) { /* *sigh* Really, clang, really? */
|
|
-#else
|
|
- if (std::isfinite(user_value)) {
|
|
-#endif
|
|
+ if (isfinite(user_value)) {
|
|
result = true;
|
|
|
|
// Clamp the user's value if needed
|