Windows compatibility, part 2.

Author: adalisk-emikhaylov

include/pybind11/detail/non_limited_api.h

@@ -56,9 +56,12 @@ typedef void Py_buffer_;
 
 using namespace detail;
 
-#ifdef __clang__
-// warning: 'pybind11NLA_error_fetch_and_normalize_format_value_and_trace' has C-linkage specified, but returns user-defined type 'std::string' (aka 'basic_string<char>') which is incompatible with C [-Wreturn-type-c-linkage]
+#if defined(__clang__)
+// warning: 'X' has C-linkage specified, but returns user-defined type 'std::string' (aka 'basic_string<char>') which is incompatible with C [-Wreturn-type-c-linkage]
 #define PYBIND11_NONLIMITEDAPI_SILENCE_EXTERN_C_WARNING(...) _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wreturn-type-c-linkage\"") __VA_ARGS__ _Pragma("clang diagnostic pop")
+#elif defined(_MSC_VER)
+// 'X' has C-linkage specified, but returns UDT 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>' which is incompatible with C
+#define PYBIND11_NONLIMITEDAPI_SILENCE_EXTERN_C_WARNING(...) _Pragma("warning(push)") _Pragma("warning(disable: 4190)") __VA_ARGS__ _Pragma("warning(pop)")
 #else
 #define PYBIND11_NONLIMITEDAPI_SILENCE_EXTERN_C_WARNING(...) __VA_ARGS__
 #endif
@@ -186,7 +189,7 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
         HMODULE module_handle = NULL; \
         if (!GetModuleHandleExW( \
             GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, \
-            (LPCTSTR)MR::SystemPath::getLibraryPath, \
+            (LPCTSTR)PYBIND11_CONCAT(PyInit_, module_), \
             &module_handle \
         )) \
         { \
@@ -200,7 +203,7 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
             throw std::runtime_error( "pybind11 non-limited-api: The self library path is too long." ); \
         \
         return std::filesystem::path(path).parent_path() PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB_WITH_SLASH; \
-    }();
+    }()
 #else
 #define PYBIND11_NONLIMITEDAPI_GET_SHARED_LIBRARY_DIR(module_) \
     []{ \

source/non_limited_api/non_limited_api.cpp

@@ -384,7 +384,7 @@ static PyThreadState *get_thread_state_unchecked() {
 
 static int pybind11_getbuffer(PyObject *obj, Py_buffer *view, int flags) {
     // Look for a `get_buffer` implementation in this type's info or any bases (following MRO).
-    type_info *tinfo = nullptr;
+    detail::type_info *tinfo = nullptr;
     for (auto type : reinterpret_borrow<tuple>(Py_TYPE(obj)->tp_mro)) {
         tinfo = get_type_info((PyTypeObject *) type.ptr());
         if (tinfo && tinfo->get_buffer) {
@@ -1675,7 +1675,7 @@ self.m_base.attr(op) = cpp_function(
 void pybind11::non_limited_api::pybind11NLA_get_type_override(function &ret, const void *this_ptr, const type_info *this_type, const char *name) {
     handle self = get_object_handle(this_ptr, this_type);
     if (!self) {
-        return function();
+        return;
     }
     handle type = type::handle_of(self);
     auto key = std::make_pair(type.ptr(), name);