Changeset ca9096f in git


Ignore:
Timestamp:
Aug 16, 2011, 7:31:07 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '52dcfddee5ec87d404d5e0fb44f2d627608208f1')
Children:
643b538e22eb5f58bfb7663b4801ca17c1bfb00a
Parents:
9b57340f94fb367ee993e6e90c527c2c5208501b
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-16 19:31:07+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:21+01:00
Message:
ADD: #ifdef HAVE_MPSR safeguards around the header-content
CHG: minor cleanups
Location:
Singular
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Singular/mpsr.h

    r9b5734 rca9096f  
    1212 *
    1313 ***************************************************************/
    14 #ifdef HAVE_MPSR
    15 
    1614#ifndef __MPSR__
    1715#define __MPSR__
    1816
     17#ifdef HAVE_MPSR
     18
     19
     20#include <omalloc/omalloc.h>
     21
     22#include <coeffs/numbers.h>
     23
     24#include <polys/polys.h>
     25#include <polys/monomials/ring.h>
     26
     27#include <kernel/structs.h>
     28
     29#include <Singular/subexpr.h>
     30
    1931// now the MP include stuff (is surrounded by ifndef there)
    2032#include <MP.h>
    21 
    2233#include <MPT.h>
    23 #include <kernel/structs.h>
    24 #include "subexpr.h"
    25 #include <omalloc/omalloc.h>
    26 #include <polys/polys.h>
    27 #include <coeffs/numbers.h>
    28 #include <polys/monomials/ring.h>
    2934
    3035/***************************************************************
     
    267272
    268273
     274#endif // #ifdef HAVE_MPSR
     275
    269276#endif
    270 #endif
  • Singular/mpsr_Get.cc

    r9b5734 rca9096f  
    629629  }
    630630  if (rank == 1)
    631     id->rank = idRankFreeModule(id);
     631    id->rank = id_RankFreeModule(id, currRing);
    632632  idTest(id);
    633633  mlv->lv = mpsr_InitLeftv(MODUL_CMD, (void *) id);
  • Singular/mpsr_Put.h

    r9b5734 rca9096f  
    1818#define __MPSR_PUT__
    1919
    20 #include"mpsr.h"
     20
     21#ifdef HAVE_MPSR
    2122
    2223#include <kernel/structs.h>
    23 #include"kernel/febase.h"
    24 #include"tok.h"
    25 #include"ipid.h"
     24#include <kernel/febase.h>
     25
     26#include <Singular/mpsr.h>
     27#include <Singular/tok.h>
     28#include <Singular/ipid.h>
    2629
    2730/***************************************************************
     
    229232extern mpsr_Status_t mpsr_PutMsg(MP_Link_pt l, leftv v);
    230233
     234
     235#endif // #ifdef HAVE_MPSR
     236
     237
    231238#endif
  • Singular/mpsr_Tok.h

    r9b5734 rca9096f  
    1313 *
    1414 ***************************************************************/
     15
     16#ifdef HAVE_MPSR
     17
    1518#ifndef __MPSR_TOK_H__
    1619#define __MPSR_TOK_H__
    17 #include"mpsr.h"
     20
     21#include <Singular/mpsr.h>
    1822
    1923extern mpsr_Status_t mpsr_tok2mp(short tok, MP_DictTag_t *dict,
     
    3034
    3135#endif  // __MPSR_TOK_H__
     36
     37
     38#endif // #ifdef HAVE_MPSR
  • Singular/mpsr_sl.h

    r9b5734 rca9096f  
    99 *  Version: $Id$
    1010 *******************************************************************/
     11
     12#ifndef _SINGULAR_MPSR_SL_H_
     13#define _SINGULAR_MPSR_SL_H_
     14
     15#ifdef HAVE_MPSR
     16
     17
    1118LINKAGE BOOLEAN slOpenMPFile(si_link l, short flag, leftv u);
    1219LINKAGE MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv);
     
    2431LINKAGE int Batch_do(const char* port, const char* host);
    2532
     33#endif // #ifdef HAVE_MPSR
     34
     35#endif // _SINGULAR_MPSR_SL_H_
Note: See TracChangeset for help on using the changeset viewer.