diff options
-rw-r--r-- | Build/source/utils/asymptote/Makefile.in | 3 | ||||
-rw-r--r-- | Build/source/utils/asymptote/path.h | 5 | ||||
-rw-r--r-- | Build/source/utils/asymptote/path3.h | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in index 91613c1ff75..eba734e3710 100644 --- a/Build/source/utils/asymptote/Makefile.in +++ b/Build/source/utils/asymptote/Makefile.in @@ -96,6 +96,7 @@ asy.o: asy.rc asy.ico Makefile all: asy man faq asy-keywords.el +GCLIB_CHECK = $(MAKE) check $(GCLIB): $(GC).tar.gz gunzip -c $(GC).tar.gz > $(GC).tar tar -xf $(GC).tar @@ -108,7 +109,7 @@ $(GCLIB): $(GC).tar.gz fi cd $(GC); \ ./configure $(GCOPTIONS); \ - $(MAKE) check + $(GCLIB_CHECK) $(GCPPLIB): $(GCLIB) diff --git a/Build/source/utils/asymptote/path.h b/Build/source/utils/asymptote/path.h index 1b31408c4a1..95702bada05 100644 --- a/Build/source/utils/asymptote/path.h +++ b/Build/source/utils/asymptote/path.h @@ -450,7 +450,10 @@ extern const double third; } -// Delete the following line to work around problems with old broken compilers. +// Do -DOMIT_SOLVEDKNOT_DECL to work around redefinition error reported by +// old (broken) compilers. +#ifndef BROKEN_COMPILER GC_DECLARE_PTRFREE(camp::solvedKnot); +#endif #endif diff --git a/Build/source/utils/asymptote/path3.h b/Build/source/utils/asymptote/path3.h index 4c61b3065d4..872e19d72bd 100644 --- a/Build/source/utils/asymptote/path3.h +++ b/Build/source/utils/asymptote/path3.h @@ -380,7 +380,10 @@ double bound(triple *p, double (*m)(double, double), int depth=maxdepth); } -// Delete the following line to work around problems with old broken compilers. -GC_DECLARE_PTRFREE(camp::solvedKnot3); +// Do -DOMIT_SOLVEDKNOT_DECL to work around redefinition error reported by +// old (broken) compilers. +#ifndef BROKEN_COMPILER +GC_DECLARE_PTRFREE(camp::solvedKnot); +#endif #endif |