diff --git a/build-fixes.diff b/build-fixes.diff deleted file mode 100644 index 3d916fc..0000000 --- a/build-fixes.diff +++ /dev/null @@ -1,44 +0,0 @@ -From: Jan Engelhardt -Date: 2017-04-29 23:27:41.440333149 +0200 - -build: resolve duplicate definition - - cxsc.C:52:5: error: 'UInt** FuncLog2Int' redeclared as different kind of symbol - Obj FuncLog2Int; - /usr/lib/gap/src/gmpints.h:249:12: note: previous declaration 'UInt** FuncLog2Int(Bag, Bag)' - extern Obj FuncLog2Int( Obj self, Obj intnum); ---- - src/cxsc.C | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: float-0.7.5/src/cxsc.C -=================================================================== ---- float-0.7.5.orig/src/cxsc.C -+++ float-0.7.5/src/cxsc.C -@@ -49,7 +49,7 @@ bool Disjoint(cxsc::cinterval &a, cxsc:: - Obj TYPE_CXSC_RP, TYPE_CXSC_CP, TYPE_CXSC_RI, TYPE_CXSC_CI; - Obj IS_CXSC_RP, IS_CXSC_CP, IS_CXSC_RI, IS_CXSC_CI; - Obj FAMILY_CXSC; --Obj FuncLog2Int; -+Obj MyFuncLog2Int; - - /**************************************************************** - * creators -@@ -1153,7 +1153,7 @@ static cxsc::real get_real (Obj l, int p - cxsc::real m = Double(INT_INTOBJ(RemInt(mant,INTOBJ_INT(1 << 27)))); - cxsc::times2pown(m,-27); - m += Double(INT_INTOBJ(QuoInt(mant,INTOBJ_INT(1 << 27)))); -- cxsc::times2pown(m,exp+27-INT_INTOBJ(CALL_1ARGS(FuncLog2Int,mant))); -+ cxsc::times2pown(m,exp+27-INT_INTOBJ(CALL_1ARGS(MyFuncLog2Int,mant))); - return m; - } - -@@ -1423,7 +1423,7 @@ int InitCXSCKernel (void) - - ImportGVarFromLibrary ("CXSCFloatsFamily", &FAMILY_CXSC); - -- ImportFuncFromLibrary ("Log2Int", &FuncLog2Int); -+ ImportFuncFromLibrary ("Log2Int", &MyFuncLog2Int); - - set_unexpected (cxsc_unexpected); - set_terminate (cxsc_terminate);