Changeset ca9096f in git

Timestamp:

Aug 16, 2011, 7:31:07 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

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:

• mpsr.h (modified) (2 diffs)
• mpsr_Get.cc (modified) (1 diff)
• mpsr_Put.h (modified) (2 diffs)
• mpsr_Tok.h (modified) (2 diffs)
• mpsr_sl.h (modified) (2 diffs)

Singular/mpsr.h

@@ -12 +12 @@
  *
  ***************************************************************/
-#ifdef HAVE_MPSR
-
 #ifndef __MPSR__
 #define __MPSR__
 
+#ifdef HAVE_MPSR
+
+
+#include <omalloc/omalloc.h>
+
+#include <coeffs/numbers.h>
+
+#include <polys/polys.h>
+#include <polys/monomials/ring.h>
+
+#include <kernel/structs.h>
+
+#include <Singular/subexpr.h>
+
 // now the MP include stuff (is surrounded by ifndef there)
 #include <MP.h>
-
 #include <MPT.h>
-#include <kernel/structs.h>
-#include "subexpr.h"
-#include <omalloc/omalloc.h>
-#include <polys/polys.h>
-#include <coeffs/numbers.h>
-#include <polys/monomials/ring.h>
 
 /***************************************************************
@@ -267 +272 @@
 
 
+#endif // #ifdef HAVE_MPSR
+
 #endif
-#endif

Singular/mpsr_Get.cc

@@ -629 +629 @@
   }
   if (rank == 1)
-    id->rank = idRankFreeModule(id);
+    id->rank = id_RankFreeModule(id, currRing);
   idTest(id);
   mlv->lv = mpsr_InitLeftv(MODUL_CMD, (void *) id);

Singular/mpsr_Put.h

@@ -18 +18 @@
 #define __MPSR_PUT__
 
-#include"mpsr.h"
+
+#ifdef HAVE_MPSR
 
 #include <kernel/structs.h>
-#include"kernel/febase.h"
-#include"tok.h"
-#include"ipid.h"
+#include <kernel/febase.h>
+
+#include <Singular/mpsr.h>
+#include <Singular/tok.h>
+#include <Singular/ipid.h>
 
 /***************************************************************
@@ -229 +232 @@
 extern mpsr_Status_t mpsr_PutMsg(MP_Link_pt l, leftv v);
 
+
+#endif // #ifdef HAVE_MPSR
+
+
 #endif

Singular/mpsr_Tok.h

@@ -13 +13 @@
  *
  ***************************************************************/
+
+#ifdef HAVE_MPSR
+
 #ifndef __MPSR_TOK_H__
 #define __MPSR_TOK_H__
-#include"mpsr.h"
+
+#include <Singular/mpsr.h>
 
 extern mpsr_Status_t mpsr_tok2mp(short tok, MP_DictTag_t *dict,
@@ -30 +34 @@
 
 #endif  // __MPSR_TOK_H__
+
+
+#endif // #ifdef HAVE_MPSR

Singular/mpsr_sl.h

@@ -9 +9 @@
  *  Version: $Id$
  *******************************************************************/
+
+#ifndef _SINGULAR_MPSR_SL_H_
+#define _SINGULAR_MPSR_SL_H_
+
+#ifdef HAVE_MPSR
+
+
 LINKAGE BOOLEAN slOpenMPFile(si_link l, short flag, leftv u);
 LINKAGE MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv);
@@ -24 +31 @@
 LINKAGE int Batch_do(const char* port, const char* host);
 
+#endif // #ifdef HAVE_MPSR
+
+#endif // _SINGULAR_MPSR_SL_H_