Revision: 77646
http://sourceforge.net/p/brlcad/code/77646
Author: starseeker
Date: 2020-10-24 21:39:55 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
replace BRLCAD_DLL usage with newer style of EXPORT definitions.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/regex/regex.h.in
Modified: brlcad/branches/extbuild/src/other/ext/regex/regex.h.in
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex/regex.h.in 2020-10-24
21:34:31 UTC (rev 77645)
+++ brlcad/branches/extbuild/src/other/ext/regex/regex.h.in 2020-10-24
21:39:55 UTC (rev 77646)
@@ -99,14 +99,21 @@
# endif
#endif
+#if defined(_WIN32)
+# define COMPILER_DLLEXPORT __declspec(dllexport)
+# define COMPILER_DLLIMPORT __declspec(dllimport)
+#else
+# define COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+# define COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#endif
#ifndef REGEX_EXPORT
-# if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
-# ifdef REGEX_EXPORT_DLL
-# define REGEX_EXPORT __declspec(dllexport)
-# else
-# define REGEX_EXPORT __declspec(dllimport)
-# endif
+# if defined(REGEX_DLL_EXPORTS) && defined(REGEX_DLL_IMPORTS)
+# error "Only REGEX_DLL_EXPORTS or REGEX_DLL_IMPORTS can be defined, not
both."
+# elif defined(REGEX_DLL_EXPORTS)
+# define REGEX_EXPORT COMPILER_DLLEXPORT
+# elif defined(REGEX_DLL_IMPORTS)
+# define REGEX_EXPORT COMPILER_DLLIMPORT
# else
# define REGEX_EXPORT
# endif
@@ -114,8 +121,6 @@
/* types */
-
-
typedef struct {
int re_magic;
size_t re_nsub; /* number of parenthesized subexpressions */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
