Changeset 55cb6b in git for Singular/cntrlc.cc

Timestamp:

Apr 10, 2013, 4:04:09 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ccae2f26143f71606cceb669458d60a2c39c4654

Parents:

c60380d927be780ce0fe437b14c03e70f0df8f5984299e1e1d2b92c5e28fc52391cc529f8eb8ade7

Message:

Merge pull request #317 from mmklee/factory_flint_built

fix: include problems when compiling without NTL but with FLINT

File:

• Singular/cntrlc.cc (modified) (8 diffs)

Singular/cntrlc.cc

@@ -26 +26 @@
 #include <kernel/febase.h>
 void sig_chld_hdl(int sig); /*#include <Singular/links/ssiLink.h>*/
+//#include <Singular/feOpt.h>
+//#include <Singular/version.h>
+//#include <Singular/silink.h>
+//#include <Singular/ssiLink.h>
+#include <Singular/si_signals.h>
 
 #include "tok.h"
@@ -138 +143 @@
      fprintf(stderr, "Unable to init signal %d ... exiting...\n", sig);
   }
-#ifdef HAVE_SIGINTERRUPT
-  siginterrupt(sig, 0);
+  si_siginterrupt(sig, 0);
   /*system calls will be restarted if interrupted by  the  specified
    * signal sig.  This is the default behavior in Linux.
    */
-#endif
 #else
   struct sigaction new_action,old_action;
@@ -154 +157 @@
     new_action.sa_flags = SA_RESTART;
 
-  int r=sigaction (sig, &new_action, &old_action);
+  int r=si_sigaction (sig, &new_action, &old_action);
   si_hdl_typ retval=(si_hdl_typ)old_action.sa_handler;
   if (r == -1)
@@ -498 +501 @@
   if (pid == 0)
   {
-    close (0); dup2 (in_fd[0],0);   /* set the stdin to the in pipe */
-    close (1); dup2 (out_fd[1],1);  /* set the stdout to the out pipe */
-    close (2); dup2 (out_fd[1],2);  /* set the stderr to the out pipe */
+    si_close (0); si_dup2 (in_fd[0],0);   /* set the stdin to the in pipe */
+    si_close (1); si_dup2 (out_fd[1],1);  /* set the stdout to the out pipe */
+    si_close (2); si_dup2 (out_fd[1],2);  /* set the stderr to the out pipe */
 
     execvp (args[0], args);      /* exec gdb */
@@ -515 +518 @@
   FD_SET (out_fd[0], &fdset);
 
-  write (in_fd[1], "backtrace\n", 10);
-  write (in_fd[1], "p si_stop_stack_trace_x = 0\n", 28);
-  write (in_fd[1], "quit\n", 5);
+  si_write (in_fd[1], "backtrace\n", 10);
+  si_write (in_fd[1], "p si_stop_stack_trace_x = 0\n", 28);
+  si_write (in_fd[1], "quit\n", 5);
 
   index = 0;
@@ -528 +531 @@
     tv.tv_usec = 0;
 
-    sel = select (FD_SETSIZE, &readset, NULL, NULL, &tv);
+    sel = si_select (FD_SETSIZE, &readset, NULL, NULL, &tv);
     if (sel == -1)
       break;
@@ -534 +537 @@
     if ((sel > 0) && (FD_ISSET (out_fd[0], &readset)))
     {
-      if (read (out_fd[0], &c, 1))
+      if (si_read (out_fd[0], &c, 1))
       {
         switch (state)
@@ -565 +568 @@
   }
 
-  close (in_fd[0]);
-  close (in_fd[1]);
-  close (out_fd[0]);
-  close (out_fd[1]);
+  si_close (in_fd[0]);
+  si_close (in_fd[1]);
+  si_close (out_fd[0]);
+  si_close (out_fd[1]);
   m2_end(0);
 }