Changeset 8b1af6 in git for Singular/misc_ip.cc

Timestamp:

Nov 6, 2013, 2:30:52 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

93fc820b11e13b03357f9d05061a1954e37d658c

Parents:

75761633171290fa9ee90c7fc19a9d9bfba3534911ab4e8595e6e90a6b646949f46d516f88a72015

Message:

Merge pull request #389 from jankoboehm/spielwiese

Gerhards fix for zeroRad und some typos

File:

• Singular/misc_ip.cc (modified) (3 diffs)

Singular/misc_ip.cc

@@ -360 +360 @@
   {
     multiplicitiesL->m[i].rtyp = INT_CMD;
-    multiplicitiesL->m[i].data = (void*)multiplicities[i];
+    multiplicitiesL->m[i].data = (void*)(long)multiplicities[i];
   }
   omFree(multiplicities);
@@ -786 +786 @@
   StringAppend("Singular for %s version %s (%s, %d bit) %s #%s",
                S_UNAME, S_VERSION1, // SINGULAR_VERSION,
-               PACKAGE_VERSION, SIZEOF_LONG*8, singular_date, GIT_VERSION);
+               PACKAGE_VERSION, SIZEOF_VOIDP*8, singular_date, GIT_VERSION);
   StringAppendS("\nwith\n\t");
-#ifdef HAVE_FACTORY
-  StringAppend("factory(%s){'%s','%s'}", factoryVersion, FACTORY_CFLAGS, FACTORY_LIBS);
-#ifdef HAVE_LIBFAC
-  // libfac:
-//  extern const char * libfac_version;
-//  extern const char * libfac_date;
-  StringAppend("+libfac");
-#endif // #ifdef HAVE_LIBFAC
-  StringAppend(",");
-#endif
 
 #if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
-              StringAppend("GMP(%d.%d){'%s','%s'},",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR, GMP_CFLAGS, GMP_LIBS);
-#else
-              StringAppendS("GMP(1.3),");
+              StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
 #endif
 #ifdef HAVE_NTL
 #include <NTL/version.h>
-              StringAppend("NTL(%s){'%s','%s'},",NTL_VERSION, NTL_CFLAGS, NTL_LIBS);
-#endif
-
-#ifdef HAVE_FACTORY
+              StringAppend("NTL(%s),",NTL_VERSION);
+#endif
+
 #ifdef HAVE_FLINT
               StringAppend("FLINT(%s){'%s','%s'},",version, FLINT_CFLAGS, FLINT_LIBS);
 #endif
-#endif
-
-#if SIZEOF_VOIDP == 8
-              StringAppendS("64bit,");
-#else
-              StringAppendS("32bit,");
-#endif
+
 #if defined(HAVE_DYN_RL)
               if (fe_fgets_stdin==fe_fgets_dummy)
@@ -856 +837 @@
 #endif
               if (p_procs_dynamic) StringAppendS("dynamic p_Procs,");
-#ifdef TEST
-              StringAppendS("TESTs,");
-#endif
 #if YYDEBUG
               StringAppendS("YYDEBUG=1,");