Changeset e5ecb5 in git


Ignore:
Timestamp:
May 10, 2013, 7:40:53 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '79dfb9a6d258bfeb991428bdb25b8f55e9e809b2')
Children:
6593beffd119ec3637eeb3be5c0350d70c646abbc9949879f3d301c9c1778b9de589982a6b5eff25
Parents:
31e974b5248d027aefd2b1f1898b085e9f9e9cbb
Message:
fix: changes for xmalloc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • Singular/fevoices.cc

    r31e974 re5ecb5  
    576576  {
    577577    // handle prot:
    578     if (feProt&PROT_I)
     578    if (feProt&SI_PROT_I)
    579579    {
    580580      fputs(s,feProtFile);
  • Singular/iparith.cc

    r31e974 re5ecb5  
    27052705  while(*opt!='\0')
    27062706  {
    2707     if (*opt=='i') mode |= PROT_I;
    2708     else if (*opt=='o') mode |= PROT_O;
     2707    if (*opt=='i') mode |= SI_PROT_I;
     2708    else if (*opt=='o') mode |= SI_PROT_O;
    27092709    opt++;
    27102710  }
     
    27282728    while(*opt!='\0')
    27292729    {
    2730       if (*opt=='i') mode |= PROT_I;
    2731       else if (*opt=='o') mode |= PROT_O;
     2730      if (*opt=='i') mode |= SI_PROT_I;
     2731      else if (*opt=='o') mode |= SI_PROT_O;
    27322732      opt++;
    27332733    }
  • kernel/kstd1.cc

    r31e974 re5ecb5  
    12261226  mora_count++;
    12271227  mora_loop_count = 0;
    1228 #endif
    1229 #ifdef KDEBUG
    1230   om_Opts.MinTrack = 5;
    12311228#endif
    12321229  int olddeg = 0;
  • kernel/kstd2.cc

    r31e974 re5ecb5  
    11591159  int loop_count = 0;
    11601160#endif /* KDEBUG */
    1161   om_Opts.MinTrack = 5;
    11621161  int   red_result = 1;
    11631162  int   olddeg,reduc;
     
    15101509  int loop_count = 0;
    15111510#endif /* KDEBUG */
    1512   om_Opts.MinTrack = 5;
    15131511  int   srmax,lrmax, red_result = 1;
    15141512  int   olddeg,reduc;
     
    24972495  int loop_count = 0;
    24982496#endif
    2499   om_Opts.MinTrack = 5;
    25002497  int   red_result = 1;
    25012498  int   olddeg,reduc;
  • kernel/sca.cc

    r31e974 re5ecb5  
    156156#endif
    157157
    158 #ifdef KDEBUG
    159   om_Opts.MinTrack = 5;
    160 #endif
    161 
    162158  int olddeg, reduc;
    163159  int red_result = 1;
     
    435431
    436432//  strat->homog = strat->homog && strat->z2homog; // ?
    437 
    438 
    439 
    440 #ifdef KDEBUG
    441   om_Opts.MinTrack = 5;
    442 #endif
    443433
    444434  int   red_result = 1;
     
    935925#endif
    936926
    937 #ifdef KDEBUG
    938   om_Opts.MinTrack = 5;
    939 #endif
    940 
    941 
    942927  strat->update = TRUE;
    943928  //- setting global variables ------------------- -
  • libpolys/reporter/reporter.cc

    r31e974 re5ecb5  
    220220    fwrite("\n",1,1,stdout);
    221221    fflush(stdout);
    222     if (feProt&PROT_O)
     222    if (feProt&SI_PROT_O)
    223223    {
    224224      fwrite(warn_str,1,6,feProtFile);
     
    302302      fwrite(s,1,strlen(s),stdout);
    303303      fflush(stdout);
    304       if (feProt&PROT_O)
     304      if (feProt&SI_PROT_O)
    305305      {
    306306        fwrite(s,1,strlen(s),feProtFile);
  • libpolys/reporter/reporter.h

    r31e974 re5ecb5  
    3131#define TRACE_TMP_BREAKPOINT  64
    3232
    33 #define PROT_NONE 0
    34 #define PROT_I    1
    35 #define PROT_O    2
    36 #define PROT_IO   3
     33#define SI_PROT_I    1
     34#define SI_PROT_O    2
     35#define SI_PROT_IO   3
    3736
    3837/* the C-part: */
Note: See TracChangeset for help on using the changeset viewer.