ncurses 6.2 - patch 20200404

[ncurses.git] / include / ncurses_dll.h.in

diff --git a/include/ncurses_dll.h.in b/include/ncurses_dll.h.in
index f439d48013cae3cbccd1c1d25f54a19fd88f0b85..469ab580618b4c17d4510f0217561b54a5ae967d 100644 (file)
--- a/include/ncurses_dll.h.in
+++ b/include/ncurses_dll.h.in
@@ -26,7 +26,7 @@
  * sale, use or other dealings in this Software without prior written       *
  * authorization.                                                           *
  ****************************************************************************/
-/* $Id: ncurses_dll.h.in,v 1.12 2020/02/02 23:34:34 tom Exp $ */
+/* $Id: ncurses_dll.h.in,v 1.15 2020/04/04 23:37:36 tom Exp $ */
 
 #ifndef NCURSES_DLL_H_incl
 #define NCURSES_DLL_H_incl 1
@@ -66,7 +66,7 @@
  * using functions to access them.
  */
 #define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name
-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
+#define NCURSES_WRAPPED_VAR(type,name) extern NCURSES_IMPEXP type NCURSES_PUBLIC_VAR(name)(void)
 
 /* no longer needed on cygwin or mingw, thanks to auto-import       */
 /* but this structure may be useful at some point for an MSVC build */
@@ -75,16 +75,21 @@
 #undef NCURSES_DLL
 #define NCURSES_STATIC
 
+/*
+ * These are configurable:
+ */
+#undef NCURSES_API
+#undef NCURSES_CXX_IMPEXP
+#undef NCURSES_EXPORT
+#undef NCURSES_EXPORT_VAR
+#undef NCURSES_IMPEXP
+
 #if defined(__CYGWIN__) || defined(_WIN32)
 #  if defined(NCURSES_DLL)
 #    if defined(NCURSES_STATIC)
 #      undef NCURSES_STATIC
 #    endif
 #  endif
-#  undef NCURSES_IMPEXP
-#  undef NCURSES_API
-#  undef NCURSES_EXPORT
-#  undef NCURSES_EXPORT_VAR
 #  if defined(NCURSES_DLL)
 /* building a DLL */
 #    define NCURSES_IMPEXP __declspec(dllexport)
@@ -100,9 +105,12 @@
 #  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
 #endif
 
-/* Take care of non-cygwin platforms */
+/* Take care of non-Windows platforms */
 #if !defined(NCURSES_IMPEXP)
-#  define NCURSES_IMPEXP /* nothing */
+#  define NCURSES_IMPEXP @NCURSES_IMPEXP@
+#endif
+#if !defined(NCURSES_CXX_IMPEXP)
+#  define NCURSES_CXX_IMPEXP @NCURSES_CXX_IMPEXP@
 #endif
 #if !defined(NCURSES_API)
 #  define NCURSES_API /* nothing */