Changeset 5348866 in git


Ignore:
Timestamp:
Sep 9, 2011, 7:36:52 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
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:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/grammar.cc

    r1133b7 r5348866  
    472472    Werror("leaving %s",VoiceName());
    473473  }
    474   #ifdef HAVE_FACTORY
     474#ifdef HAVE_FACTORY
    475475  // libfac:
     476#ifdef HAVE_LIBFAC
    476477  extern int libfac_interruptflag;
    477478  libfac_interruptflag=0;
    478   #endif
     479#endif // #ifdef HAVE_LIBFAC
     480#endif
    479481}
    480482
  • Singular/grammar.y

    r1133b7 r5348866  
    168168    Werror("leaving %s",VoiceName());
    169169  }
    170   #ifdef HAVE_FACTORY
     170#ifdef HAVE_FACTORY
    171171  // libfac:
     172#ifdef HAVE_LIBFAC
    172173  extern int libfac_interruptflag;
    173174  libfac_interruptflag=0;
    174   #endif
     175#endif // #ifdef HAVE_LIBFAC
     176#endif
    175177}
    176178
  • Singular/misc_ip.cc

    r1133b7 r5348866  
    2020#define SI_DONT_HAVE_GLOBAL_VARS
    2121#include <factory/factory.h>
    22 // libfac:
    23 extern const char * libfac_version;
    24 extern const char * libfac_date;
    2522#endif
    2623
     
    740737  StringAppendS("\t");
    741738#ifdef HAVE_FACTORY
    742               StringAppend("factory(%s),", factoryVersion);
    743               StringAppend("libfac(%s,%s),\n\t",libfac_version,libfac_date);
    744 #endif
     739  StringAppend("factory(%s),", factoryVersion);
     740#ifdef HAVE_LIBFAC
     741  // libfac:
     742  extern const char * libfac_version;
     743  extern const char * libfac_date;
     744  StringAppend("libfac(%s,%s),\n\t",libfac_version,libfac_date);
     745#endif // #ifdef HAVE_LIBFAC
     746#endif
     747
    745748#if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
    746749              StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
  • kernel/misc.cc

    r1133b7 r5348866  
    1212#  include <factory/factory.h>
    1313/* libfac version strings */
     14#ifdef HAVE_LIBFAC
    1415  extern const char * libfac_version;
    1516  extern const char * libfac_date;
     17#endif // #ifdef HAVE_LIBFAC
    1618#endif
    1719
  • libpolys/polys/clapsing.cc

    r1133b7 r5348866  
    384384#ifdef HAVE_FACTORY
    385385int singclap_factorize_retry;
    386 #if 0
    387 extern int libfac_interruptflag;
    388 #endif
     386# ifdef HAVE_LIBFAC
     387  extern int libfac_interruptflag;
     388# endif
    389389#endif
    390390
  • libpolys/reporter/reporter.cc

    r1133b7 r5348866  
    202202  errorreported = TRUE;
    203203#ifdef HAVE_FACTORY
     204#ifdef HAVE_LIBFAC
    204205  // libfac:
    205   //extern int libfac_interruptflag;
    206   //libfac_interruptflag=1;
     206  extern int libfac_interruptflag;
     207  libfac_interruptflag=1;
     208#endif
    207209#endif
    208210}
Note: See TracChangeset for help on using the changeset viewer.