Changeset e5ecb5 in git

Timestamp:

May 10, 2013, 7:40:53 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6593beffd119ec3637eeb3be5c0350d70c646abbc9949879f3d301c9c1778b9de589982a6b5eff25

Parents:

31e974b5248d027aefd2b1f1898b085e9f9e9cbb

Message:

fix: changes for xmalloc

Files:

• Singular/fevoices.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• kernel/kstd1.cc (modified) (1 diff)
• kernel/kstd2.cc (modified) (3 diffs)
• kernel/sca.cc (modified) (3 diffs)
• libpolys/reporter/reporter.cc (modified) (2 diffs)
• libpolys/reporter/reporter.h (modified) (1 diff)

Singular/fevoices.cc

@@ -576 +576 @@
   {
     // handle prot:
-    if (feProt&PROT_I)
+    if (feProt&SI_PROT_I)
     {
       fputs(s,feProtFile);

Singular/iparith.cc

@@ -2705 +2705 @@
   while(*opt!='\0')
   {
-    if (*opt=='i') mode |= PROT_I;
-    else if (*opt=='o') mode |= PROT_O;
+    if (*opt=='i') mode |= SI_PROT_I;
+    else if (*opt=='o') mode |= SI_PROT_O;
     opt++;
   }
@@ -2728 +2728 @@
     while(*opt!='\0')
     {
-      if (*opt=='i') mode |= PROT_I;
-      else if (*opt=='o') mode |= PROT_O;
+      if (*opt=='i') mode |= SI_PROT_I;
+      else if (*opt=='o') mode |= SI_PROT_O;
       opt++;
     }

kernel/kstd1.cc

@@ -1226 +1226 @@
   mora_count++;
   mora_loop_count = 0;
-#endif
-#ifdef KDEBUG
-  om_Opts.MinTrack = 5;
 #endif
   int olddeg = 0;

kernel/kstd2.cc

@@ -1159 +1159 @@
   int loop_count = 0;
 #endif /* KDEBUG */
-  om_Opts.MinTrack = 5;
   int   red_result = 1;
   int   olddeg,reduc;
@@ -1510 +1509 @@
   int loop_count = 0;
 #endif /* KDEBUG */
-  om_Opts.MinTrack = 5;
   int   srmax,lrmax, red_result = 1;
   int   olddeg,reduc;
@@ -2497 +2495 @@
   int loop_count = 0;
 #endif
-  om_Opts.MinTrack = 5;
   int   red_result = 1;
   int   olddeg,reduc;

kernel/sca.cc

@@ -156 +156 @@
 #endif
 
-#ifdef KDEBUG
-  om_Opts.MinTrack = 5;
-#endif
-
   int olddeg, reduc;
   int red_result = 1;
@@ -435 +431 @@
 
 //  strat->homog = strat->homog && strat->z2homog; // ?
-
-
-
-#ifdef KDEBUG
-  om_Opts.MinTrack = 5;
-#endif
 
   int   red_result = 1;
@@ -935 +925 @@
 #endif
 
-#ifdef KDEBUG
-  om_Opts.MinTrack = 5;
-#endif
-
-
   strat->update = TRUE;
   //- setting global variables ------------------- -

libpolys/reporter/reporter.cc

@@ -220 +220 @@
     fwrite("\n",1,1,stdout);
     fflush(stdout);
-    if (feProt&PROT_O)
+    if (feProt&SI_PROT_O)
     {
       fwrite(warn_str,1,6,feProtFile);
@@ -302 +302 @@
       fwrite(s,1,strlen(s),stdout);
       fflush(stdout);
-      if (feProt&PROT_O)
+      if (feProt&SI_PROT_O)
       {
         fwrite(s,1,strlen(s),feProtFile);

libpolys/reporter/reporter.h

@@ -31 +31 @@
 #define TRACE_TMP_BREAKPOINT  64
 
-#define PROT_NONE 0
-#define PROT_I    1
-#define PROT_O    2
-#define PROT_IO   3
+#define SI_PROT_I    1
+#define SI_PROT_O    2
+#define SI_PROT_IO   3
 
 /* the C-part: */