Changeset 5348866 in git

Timestamp:

Sep 9, 2011, 7:36:52 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

715936e3887b6c8b379d0482bf5e4ad885b132ee

Parents:

1133b7f42d98b39d830ff6b05097b14f5bd23011

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-09 19:36:52+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:40+01:00

Message:

FIX: guarding all libfac_* variables with HAVE_LIBFAC

Files:

• Singular/grammar.cc (modified) (1 diff)
• Singular/grammar.y (modified) (1 diff)
• Singular/misc_ip.cc (modified) (2 diffs)
• kernel/misc.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/reporter/reporter.cc (modified) (1 diff)

Singular/grammar.cc

@@ -472 +472 @@
     Werror("leaving %s",VoiceName());
   }
-  #ifdef HAVE_FACTORY
+#ifdef HAVE_FACTORY
   // libfac:
+#ifdef HAVE_LIBFAC
   extern int libfac_interruptflag;
   libfac_interruptflag=0;
-  #endif
+#endif // #ifdef HAVE_LIBFAC
+#endif
 }
 

Singular/grammar.y

@@ -168 +168 @@
     Werror("leaving %s",VoiceName());
   }
-  #ifdef HAVE_FACTORY
+#ifdef HAVE_FACTORY
   // libfac:
+#ifdef HAVE_LIBFAC
   extern int libfac_interruptflag;
   libfac_interruptflag=0;
-  #endif
+#endif // #ifdef HAVE_LIBFAC
+#endif
 }
 

Singular/misc_ip.cc

@@ -20 +20 @@
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
-// libfac:
-extern const char * libfac_version;
-extern const char * libfac_date;
 #endif
 
@@ -740 +737 @@
   StringAppendS("\t");
 #ifdef HAVE_FACTORY
-              StringAppend("factory(%s),", factoryVersion);
-              StringAppend("libfac(%s,%s),\n\t",libfac_version,libfac_date);
-#endif
+  StringAppend("factory(%s),", factoryVersion);
+#ifdef HAVE_LIBFAC
+  // libfac:
+  extern const char * libfac_version;
+  extern const char * libfac_date;
+  StringAppend("libfac(%s,%s),\n\t",libfac_version,libfac_date);
+#endif // #ifdef HAVE_LIBFAC
+#endif
+
 #if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
               StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);

kernel/misc.cc

@@ -12 +12 @@
 #  include <factory/factory.h>
 /* libfac version strings */
+#ifdef HAVE_LIBFAC
   extern const char * libfac_version;
   extern const char * libfac_date;
+#endif // #ifdef HAVE_LIBFAC
 #endif
 

libpolys/polys/clapsing.cc

@@ -384 +384 @@
 #ifdef HAVE_FACTORY
 int singclap_factorize_retry;
-#if 0
-extern int libfac_interruptflag;
-#endif
+# ifdef HAVE_LIBFAC
+  extern int libfac_interruptflag;
+# endif
 #endif
 

libpolys/reporter/reporter.cc

@@ -202 +202 @@
   errorreported = TRUE;
 #ifdef HAVE_FACTORY
+#ifdef HAVE_LIBFAC
   // libfac:
-  //extern int libfac_interruptflag;
-  //libfac_interruptflag=1;
+  extern int libfac_interruptflag;
+  libfac_interruptflag=1;
+#endif
 #endif
 }