[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 7e7c2085168ed51052d48f6a652bcd1d9a95886b
Author: Yue Ren <ren at mathematik.uni-kl.de>
Date:   Wed Feb 15 14:18:19 2012 +0100

    bugfixes
    
    - fixed bugs that arose after moving convex geometry files to seperate folder
    - fixed bugs that arises when trying to build stuff in 32bit machines

diff --git a/callgfanlib/Makefile b/callgfanlib/Makefile
index b9ddc90..2be8862 100755
--- a/callgfanlib/Makefile
+++ b/callgfanlib/Makefile
@@ -1,11 +1,11 @@
 all: gfanlib
 
 gfanlib: 
-	g++ -o bbcone.o -fpic -I/home/ren/Sources/ -c -g bbcone.cc
-	g++ -o bbfan.o -fpic -I/home/ren/Sources/ -c -g bbfan.cc
-	g++ -o bbpolytope.o -fpic -I/home/ren/Sources/ -c -g bbpolytope.cc
-	g++ -o gfanlib.o -fpic -I/home/ren/Sources/ -c -g gfanlib.cc
-	g++ -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o -L/usr/local/lib -lcddgmp -lgmpxx ../gfanlib/*.o
+	g++ -DOM_DEBUG -DNDEBUG -o bbcone.o -fpic -I/home/ren/Sources/ -c -g bbcone.cc
+	g++ -DOM_DEBUG -DNDEBUG -o bbfan.o -fpic -I/home/ren/Sources/ -c -g bbfan.cc
+	g++ -DOM_DEBUG -DNDEBUG -o bbpolytope.o -fpic -I/home/ren/Sources/ -c -g bbpolytope.cc
+	g++ -DOM_DEBUG -DNDEBUG -o gfanlib.o -fpic -I/home/ren/Sources/ -c -g gfanlib.cc
+	g++ -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o ../gfanlib/*.o -L/usr/local/lib -lcddgmp -lgmpxx 
 
 clean:
 	rm *.so *.o
diff --git a/callgfanlib/bbcone.cc b/callgfanlib/bbcone.cc
index 942a7c5..20f584e 100644
--- a/callgfanlib/bbcone.cc
+++ b/callgfanlib/bbcone.cc
@@ -1,6 +1,6 @@
 #include <Singular/mod2.h>
 
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -1277,5 +1277,5 @@ void bbcone_setup()
   //Print("created type %d (cone)\n",coneID); 
 }
 
-#endif
+// #endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbcone.h b/callgfanlib/bbcone.h
index 50dd871..56b1323 100755
--- a/callgfanlib/bbcone.h
+++ b/callgfanlib/bbcone.h
@@ -1,7 +1,7 @@
 #ifndef BBCONE_H
 #define BBCONE_H
 
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 #include <kernel/intvec.h>
 
@@ -24,5 +24,5 @@ int isSimplicial(gfan::ZCone* zc);
 bool containsInSupport(gfan::ZCone* zc, gfan::ZCone* zd);
 bool containsInSupport(gfan::ZCone* zc, intvec* vec);
 
-#endif
+// #endif
 #endif
diff --git a/callgfanlib/bbfan.cc b/callgfanlib/bbfan.cc
index ea56ec6..905106d 100644
--- a/callgfanlib/bbfan.cc
+++ b/callgfanlib/bbfan.cc
@@ -1,5 +1,5 @@
 #include <Singular/mod2.h>
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -730,5 +730,5 @@ void bbfan_setup()
   //Print("created type %d (fan)\n",fanID); 
 }
 
-#endif
+// #endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbfan.h b/callgfanlib/bbfan.h
index 86ad31d..c5edfc4 100755
--- a/callgfanlib/bbfan.h
+++ b/callgfanlib/bbfan.h
@@ -1,7 +1,7 @@
 #ifndef BBFAN_H
 #define BBFAN_H
 
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 
 extern int fanID;
@@ -13,5 +13,5 @@ int getCodimension(gfan::ZFan* zf);
 int getDimension(gfan::ZFan* zf);
 int getLinealityDimension(gfan::ZFan* zf);
 
-#endif
+// #endif
 #endif
diff --git a/callgfanlib/bbpolytope.cc b/callgfanlib/bbpolytope.cc
index 0a615c5..f19f00d 100644
--- a/callgfanlib/bbpolytope.cc
+++ b/callgfanlib/bbpolytope.cc
@@ -1,6 +1,6 @@
 #include <Singular/mod2.h>
 
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -529,5 +529,5 @@ void bbpolytope_setup()
   //Print("created type %d (polytope)\n",polytopeID); 
 }
 
-#endif
+// #endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbpolytope.h b/callgfanlib/bbpolytope.h
index d75683f..fd2e6fc 100755
--- a/callgfanlib/bbpolytope.h
+++ b/callgfanlib/bbpolytope.h
@@ -1,7 +1,7 @@
 #ifndef BBPOLYTOPE_H
 #define BBPOLYTOPE_H
 
-#ifdef HAVE_FANS
+// #ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 
 extern int polytopeID;
@@ -13,5 +13,5 @@ int getAmbientDimension(gfan::ZCone* zc); // zc is meant to represent a polytope
 int getCodimension(gfan::ZCone *zc);
 int getDimension(gfan::ZCone* zc);
 
-#endif
+// #endif
 #endif
diff --git a/callpolymake/polymake.cc b/callpolymake/polymake.cc
index 4ac5f6d..e43619a 100755
--- a/callpolymake/polymake.cc
+++ b/callpolymake/polymake.cc
@@ -16,9 +16,9 @@
 #include <kernel/febase.h>
 #include <kernel/intvec.h>
 
-#include <kernel/bbcone.h>
-#include <kernel/bbfan.h>
-#include <kernel/bbpolytope.h>
+#include <callgfanlib/bbcone.h>
+#include <callgfanlib/bbfan.h>
+#include <callgfanlib/bbpolytope.h>
 
 #include <Singular/ipshell.h>
 #include <Singular/subexpr.h>

-- 
an open source computer algebra system