Changeset ea57e3 in git

Timestamp:

Mar 8, 2011, 6:51:02 PM (12 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

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

Children:

528f5b7b3ceb19836379fc4ff7686f811093c001

Parents:

cf29d0c4a67afdf6039daded7f0bcbd17622873a

Message:

bugfixes

git-svn-id: file:///usr/local/Singular/svn/trunk@13947 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/iparith.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -3230 +3230 @@
     WerrorS("negative timeout"); return TRUE;
   }
-  int t = 1000*getRTimer()/timer_resolution;
+  int t = 1000*getRTimer()/TIMER_RESOLUTION;
   int i;
   int ret = 1;
@@ -3241 +3241 @@
       Lforks->m[i-1].rtyp=DEF_CMD;
       Lforks->m[i-1].data=NULL;
-      timeout = si_max(0,timeout - 1000*getRTimer()/timer_resolution + t);
+      timeout = si_max(0,timeout - 1000*getRTimer()/TIMER_RESOLUTION + t);
     }
     else { ret = 0; break; /* terminate the for loop */ }
@@ -4614 +4614 @@
   return FALSE;
 }
-BOOLEAN jjWAIT1ST1(leftv res, leftv a)
-{
-// input: a: a list with links of type
+BOOLEAN jjWAIT1ST1(leftv res, leftv u)
+{
+// input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
 // returns: i>0: (at least) a[i] is ready
-  lists Lforks = (lists)a->Data();
+  lists Lforks = (lists)u->Data();
   int i = slStatusSsiL(Lforks, -1);
   res->data = (void*)(long)i;
   return FALSE;
 }
-BOOLEAN jjWAITALL1(leftv res, leftv a)
-{
-// input: a: a list with links of type
+BOOLEAN jjWAITALL1(leftv res, leftv u)
+{
+// input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
 // returns: nothing. All links are ready when finished.