Changeset 55cb6b in git for libpolys/coeffs/ffields.cc

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

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:

• libpolys/coeffs/ffields.cc (modified) (14 diffs)

libpolys/coeffs/ffields.cc

@@ -22 +22 @@
 #include <string.h>
 #include <math.h>
+#include <errno.h>
 
 BOOLEAN nfGreaterZero (number k, const coeffs r);
@@ -225 +226 @@
 {
   assume(i==1);
-  
+
   if( i == 1 )
     return (number)1;
@@ -655 +656 @@
     /*this field is already set*/  return;
   int i=0;
-  
-  while ((fftable[i]!=c) && (fftable[i]!=0)) 
+
+  while ((fftable[i]!=c) && (fftable[i]!=0))
     i++;
-  
+
   if (fftable[i]==0)
   {
@@ -693 +694 @@
     }
     int q;
-    sscanf(buf,"%d %d",&r->m_nfCharP,&q);
+    int res = -1;
+    do
+    {
+      res = sscanf(buf,"%d %d",&r->m_nfCharP,&q);
+    }
+    while((res < 0) and (errno == EINTR));
+
     nfReadMipo(buf);
     r->m_nfCharQ1=r->m_nfCharQ-1;
@@ -829 +836 @@
 
   const int P = n_NumberOfParameters(r);
-  
+
   for( int i = 1; i <= P; i++ )
-    if (p[i-1] != NULL) 
+    if (p[i-1] != NULL)
       omFree( (ADDRESS)p[i-1] );
-  
-  omFreeSize((ADDRESS)p, P * sizeof(char*));  
+
+  omFreeSize((ADDRESS)p, P * sizeof(char*));
 }
 
@@ -865 +872 @@
   //r->cfRePart = ndCopy;
   //r->cfImPart = ndReturn0;
-  
+
   r->cfWriteLong = nfWriteLong;
   r->cfInit_bigint = nlModP;
@@ -884 +891 @@
   // debug stuff
   r->cfCoeffWrite=nfCoeffWrite;
-   
+
   r->cfParDeg = nfParDeg;
 
@@ -890 +897 @@
   r->cfDBTest=nfDBTest;
 #endif
-  
+
   // the variables:
   r->nNULL = (number)0;
@@ -900 +907 @@
 
   const char * name = p->GFPar_name;
-  
+
   r->m_nfCharQ = 0;
   r->m_nfCharP = p->GFChar;
@@ -913 +920 @@
   assume( pParameterNames != NULL );
   assume( pParameterNames[0] != NULL );
-  
+
   r->pParameterNames = pParameterNames;
   // NOTE: r->m_nfParameter was replaced by n_ParameterNames(r)[0]
@@ -937 +944 @@
   }
 
-  const double check= log ((double) (p->GFChar)); 
+  const double check= log ((double) (p->GFChar));
 
   if( (p->GFDegree * check) > sixteenlog2 )
@@ -950 +957 @@
 
   nfReadTable(c, r);
-  
+
   if( r->m_nfPlus1Table == NULL )
   {
@@ -958 +965 @@
     return TRUE;
   }
-  
-  
+
+
   assume (r -> m_nfCharQ > 0);
 
-  r->ch = r->m_nfCharP; 
+  r->ch = r->m_nfCharP;
   assume( r->m_nfPlus1Table != NULL );
-  
+
   return FALSE;
-  
+
 }
 
@@ -981 +988 @@
     char *s=StringEndS(); PrintS(s); omFree(s);
   }
-  else PrintS("//   minpoly        : ...\n"); 
+  else PrintS("//   minpoly        : ...\n");
 }