Changeset 6b7828 in git

Timestamp:

Sep 11, 2013, 5:06:31 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

1e5bbd70c45325682c85dd82ac76bdd5d0cdecbf

Parents:

152ec74edbee09b172a256b0a6b596d4c76046ebfab2ac77da13bbb52cf53fb19b26eac2b7f4d24c

Message:

Merge pull request #365 from steenpass/changes_from_master

Changes from master (links, signals)

Files:

• Singular/links/s_buff.h (modified) (1 diff)
• Singular/links/silink.cc (modified) (1 diff)
• Tst/Short/parallel_l.tst (deleted)
• Tst/Short/realclassify_l.tst (deleted)
• configure.ac (modified) (1 diff)
• factory/cf_gcd_smallp.cc (modified) (6 diffs)
• kernel/mod2.h.cmake.in (modified) (1 diff)
• kernel/structs.h (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

Singular/links/s_buff.h

@@ -30 +30 @@
 int s_isready(s_buff F);
 int s_iseof(s_buff F);
-
-extern sigset_t ssi_sigmask; // set in ssiLink.cc
-extern sigset_t ssi_oldmask; // set in ssiLink.cc
 #endif

Singular/links/silink.cc

@@ -136 +136 @@
     if (SI_LINK_OPEN_P(l))
     {
-      if (l->m->Kill != NULL) l->m->Kill(l);
-      else if (l->m->Close != NULL) l->m->Close(l);
-    }
+      if (l->m->Close != NULL) l->m->Close(l);
+    }
+    if ((l->data != NULL) && (l->m->Kill != NULL)) l->m->Kill(l);
     omFree((ADDRESS)l->name);
     omFree((ADDRESS)l->mode);

configure.ac

@@ -42 +42 @@
 AC_CHECK_HEADERS(unistd.h iostream.h sys/time.h sys/times.h asm/sigcontext.h)
 
-AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv pselect)
+AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv)
 
 

factory/cf_gcd_smallp.cc

@@ -737 +737 @@
         if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
              (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-             terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) || 
+             terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) ||
              (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
         {
@@ -1722 +1722 @@
 
   N= convertNmod_mat_t2FacCFMatrix (FLINTN);
+  delete N;
   nmod_mat_clear (FLINTN);
 #else
@@ -1731 +1732 @@
   }
   mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
+  delete N;
   long rk= gauss (*NTLN);
 
   N= convertNTLmat_zz_p2FacCFMatrix (*NTLN);
+  delete NTLN;
 #endif
 
@@ -1809 +1812 @@
   long rk= gauss (*NTLN);
 #endif
+  delete N;
   if (rk != M.columns())
   {
@@ -1814 +1818 @@
     nmod_mat_clear (FLINTN);
 #endif
-    delete N;
     return CFArray();
   }
@@ -1822 +1825 @@
 #else
   N= convertNTLmat_zz_p2FacCFMatrix (*NTLN);
+  delete NTLN;
 #endif
   CFArray A= readOffSolution (*N, rk);

kernel/mod2.h.cmake.in

@@ -261 +261 @@
  * Miscellanous Defines
  ******************************************************************/
-/* Under HPUX 9, system(...) returns -1 if SIGCHLD does not equal
-   SIG_DFL. However, if it stays at SIG_DFL we get zombie processes
-   for terminated childs generated by fork. Therefors some special treatment 
-   is necessary */
-#ifdef HPUX_9
-#include <stdlib.h>
-#define system hpux9_system
-#ifdef __cplusplus
-extern "C" {
-#endif
-int hpux9_system(const char* system);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
 #ifndef HAVE_LIBPARSER
 #  undef YYLPDEBUG

kernel/structs.h

@@ -89 +89 @@
 extern "C" {
 #endif
-void  m2_end(int i) __attribute__((noreturn));
+void  m2_end(int i);
 #ifdef __cplusplus
 }

libpolys/polys/ext_fields/transext.cc

@@ -1793 +1793 @@
       if (p_IsOne(num_f, ntRing))
       {
-        //DEN(result)=NULL;// Alloc0
-        COM(result) = 0;
+        DEN(result)=NULL;
+        //COM(result) = 0;
         p_Delete(&num_f,ntRing);
       }