Changeset 188de86 in git for Singular/ssiLink.cc

Timestamp:

Aug 2, 2012, 4:09:13 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

4f9652847609cefd5ff3b91d14f34611592ab699

Parents:

0419aba8292e7109329604d8ad03b70f8ef6542344a1c2199e33375a631289eaab7a81954c8383e2

Message:

Merge pull request #158 from alexanderdreyer/spielwiese

Transfering newstruct and pyobject fixes to Spielwiese

File:

• Singular/ssiLink.cc (modified) (5 diffs)

Singular/ssiLink.cc

@@ -44 +44 @@
 #include <Singular/blackbox.h>
 #include <Singular/ssiLink.h>
-
-#ifdef HAVE_MPSR
-#include <Singular/mpsr.h>
-#endif
 
 struct snumber_dummy
@@ -1414 +1410 @@
   si_link l;
   ssiInfo *d;
-  #ifdef HAVE_MPSR
-  MP_Link_pt dd;
-  #endif
   int d_fd;
   fd_set  mask, fdmask;
@@ -1485 +1478 @@
         return -2;
       }
-    #ifdef HAVE_MPSR
-      if (strcmp(l->m->type,"ssi")==0)
-      {
-        d=(ssiInfo*)l->data;
-        d_fd=d->fd_read;
-        if (d->ungetc_buf=='\0')
-        {
-          FD_SET(d_fd, &fdmask);
-          if (d_fd > max_fd) max_fd=d_fd;
-        }
-        else
-          return i+1;
-      }
-      else
-      {
-        dd=(MP_Link_pt)l->data;
-        d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-        FD_SET(d_fd, &fdmask);
-        if (d_fd > max_fd) max_fd=d_fd;
-      }
-    #else
       d=(ssiInfo*)l->data;
       d_fd=d->fd_read;
@@ -1515 +1487 @@
       else
         return i+1;
-    #endif
     }
   }
@@ -1558 +1529 @@
       {
         l=(si_link)L->m[i].Data();
-        #ifdef HAVE_MPSR
-        if (strcmp(l->m->type,"ssi")!=0)
-        {
-          // for MP links, return here:
-          dd=(MP_Link_pt)l->data;
-          d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-          if(j==d_fd) return i+1;
-        }
-        else
-        {
-          d=(ssiInfo*)l->data;
-          d_fd=d->fd_read;
-          if(j==d_fd) break;
-        }
-        #else
         d=(ssiInfo*)l->data;
         d_fd=d->fd_read;
         if(j==d_fd) break;
-        #endif
       }
     }