songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undef the macros at the end, as they are not identical (one has an EXPORT)

This commit is contained in:
Andreas Fabri 2018-05-16 15:46:38 +01:00 committed by Maxime Gimeno
parent 718db41ca5
commit 777d3057d9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CGAL_Core/include/CGAL/CORE/CoreDefs.h
View File

@ -55,7 +55,7 @@
#else // CGAL_HEADER_ONLY #else // CGAL_HEADER_ONLY
#define CGAL_GLOBAL_STATE_VAR(TYPE, NAME, VALUE) \ #define CGAL_GLOBAL_STATE_VAR(TYPE, NAME, VALUE) \
CGAL_CORE_EXPORT extern TYPE NAME; \ CGAL_EXPORT extern TYPE NAME; \
inline TYPE& get_static_##NAME() \ inline TYPE& get_static_##NAME() \
{ \ { \
return NAME; \ return NAME; \
@ -343,4 +343,6 @@ inline void setPositionalFormat(std::ostream& o = std::cout) {
#include <CGAL/enable_warnings.h> #include <CGAL/enable_warnings.h>
#undef CGAL_GLOBAL_STATE_VAR
#endif // _CORE_COREDEFS_H_ #endif // _CORE_COREDEFS_H_

2
CGAL_ImageIO/include/CGAL/ImageIO/gif_impl.h
View File

@ -699,3 +699,5 @@ static int GifError(const char *st) {
return -1; return -1;
} }
#undef CGAL_GLOBAL_STATE_VAR