[Ggnfs-commits] SF.net SVN: ggnfs:[425] trunk/src/experimental/lasieve4_64

[<Ba...@us...>]

Revision: 425
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=425&view=rev
Author:   Batalov
Date:     2012-02-12 22:23:43 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
minor

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/gmp-aux.h
    trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

Modified: trunk/src/experimental/lasieve4_64/gmp-aux.h
===================================================================
--- trunk/src/experimental/lasieve4_64/gmp-aux.h	2011-12-20 09:14:29 UTC (rev 424)
+++ trunk/src/experimental/lasieve4_64/gmp-aux.h	2012-02-12 22:23:43 UTC (rev 425)
@@ -3,7 +3,7 @@
 
 void adjust_mpz_bufsize(mpz_t**x,size_t*alloc_ptr,size_t size,size_t increment);
 int string2mpz(mpz_t rop,char*x,int base);
-#if __GNU_MP_VERSION < 3 || __GNU_MP_VERSION_MINOR == 0
+#if __GNU_MP_VERSION < 3 || GNU_MP_VERSION == 3 && GNU_MP_VERSION_MINOR == 0
 #define NEED_MPZ_MUL_SI
 void mpz_mul_si(mpz_t x,mpz_t y,long int z);
 #endif

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2011-12-20 09:14:29 UTC (rev 424)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-02-12 22:23:43 UTC (rev 425)
@@ -3992,11 +3992,13 @@
       if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
 	mpz_set(large_primes[s1][1],large_primes[s1][0]);
 	nlp[s1]= 2;
+#if 0 /* this is now tested well enough, no need for a message */
 	if(verbose > 1) {
 	  fprintf(stderr," mpqs on a prime square ");
 	  mpz_out_str(stderr,10,large_primes[s1][0]);
 	  fprintf(stderr,"^2  ");
 	}
+#endif
 	continue;
       }
       if(verbose > 1) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.