--- a/ucx/cx/common.h Mon Jan 06 21:18:56 2025 +0100
+++ b/ucx/cx/common.h Sun Feb 23 13:11:32 2025 +0100
@@ -120,22 +120,6 @@
#endif
// ---------------------------------------------------------------------------
-// Missing Defines
-// ---------------------------------------------------------------------------
-
-#ifndef SSIZE_MAX // not defined in glibc since C23 and MSVC
-#if CX_WORDSIZE == 64
-/**
- * The maximum representable value in ssize_t.
- */
-#define SSIZE_MAX 0x7fffffffffffffffll
-#else
-#define SSIZE_MAX 0x7fffffffl
-#endif
-#endif
-
-
-// ---------------------------------------------------------------------------
// Attribute definitions
// ---------------------------------------------------------------------------
@@ -282,6 +266,25 @@
#endif // __STDC_VERSION__
+
+// ---------------------------------------------------------------------------
+// MSVC specifics
+// ---------------------------------------------------------------------------
+
+#ifdef _MSC_VER
+// fix missing _Thread_local support
+#define _Thread_local __declspec(thread)
+#endif // _MSC_VER
+
+#if defined(CX_WINDLL_EXPORT)
+#define cx_attr_export __declspec(dllexport)
+#elif defined(CX_WINDLL)
+#define cx_attr_export __declspec(dllimport)
+#else
+/** Only used for building Windows DLLs. */
+#define cx_attr_export
+#endif // CX_WINDLL / CX_WINDLL_EXPORT
+
// ---------------------------------------------------------------------------
// Useful function pointers
// ---------------------------------------------------------------------------
@@ -356,21 +359,9 @@
#if __cplusplus
extern "C"
#endif
-int cx_szmul_impl(size_t a, size_t b, size_t *result);
+cx_attr_export int cx_szmul_impl(size_t a, size_t b, size_t *result);
#endif // cx_szmul
-// ---------------------------------------------------------------------------
-// Fixes for MSVC incompatibilities
-// ---------------------------------------------------------------------------
-
-#ifdef _MSC_VER
-// fix missing ssize_t definition
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-
-// fix missing _Thread_local support
-#define _Thread_local __declspec(thread)
-#endif // _MSC_VER
#endif // UCX_COMMON_H
