Merge pull request #12751 from guijan/improv-nbsd

improve NetBSD-specific code

Source/Core/Common/StringUtil.cpp

@@ -35,9 +35,6 @@
 constexpr u32 CODEPAGE_SHIFT_JIS = 932;
 constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
 #else
-#if defined(__NetBSD__)
-#define LIBICONV_PLUG
-#endif
 #include <errno.h>
 #include <iconv.h>
 #include <locale.h>
@@ -528,13 +525,8 @@ std::string CodeTo(const char* tocode, const char* fromcode, std::basic_string_v
     while (src_bytes != 0)
     {
       size_t const iconv_result =
-#if defined(__NetBSD__)
-          iconv(conv_desc, reinterpret_cast<const char**>(&src_buffer), &src_bytes, &dst_buffer,
-                &dst_bytes);
-#else
           iconv(conv_desc, const_cast<char**>(reinterpret_cast<const char**>(&src_buffer)),
                 &src_bytes, &dst_buffer, &dst_bytes);
-#endif
       if ((size_t)-1 == iconv_result)
       {
         if (EILSEQ == errno || EINVAL == errno)

Source/Core/Core/PowerPC/Expression.cpp

@@ -11,6 +11,17 @@
 #include <string_view>
 #include <utility>
 
+// https://github.com/zserge/expr/ is a C program and sorta valid C++.
+// When included in a C++ program, it's treated as a C++ code, and it may cause
+// issues: <cmath> may already be included, if so, including <math.h> may
+// not do anything. <math.h> is obligated to put its functions in the global
+// namespace, while <cmath> may or may not. The C code we're interpreting as
+// C++ won't call functions by their qualified names. The code may work anyway
+// if <cmath> puts its functions in the global namespace, or if the functions
+// are actually macros that expand inline, both of which are common.
+// NetBSD 10.0 i386 is an exception, and we need `using` there.
+using std::isinf;
+using std::isnan;
 #include <expr.h>
 
 #include "Common/BitUtils.h"