rpms/factory/devel factory-2.0.5-gcc29.patch, NONE, 1.1 factory-2.0.5-gcc34.patch, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565

Added Files:
	factory-2.0.5-gcc29.patch factory-2.0.5-gcc34.patch 
Log Message:
re-add accidentally removed patches


factory-2.0.5-gcc29.patch:

--- NEW FILE factory-2.0.5-gcc29.patch ---
--- factory/memutil.c.gcc29	2004-02-12 06:50:23.000000000 -0600
+++ factory/memutil.c	2004-10-17 21:54:48.000000000 -0500
@@ -87,13 +87,13 @@
 }
 
 void* reallocBlock ( void* block, size_t oldsize, size_t newsize )
-{
+{ void* dummy;
 #if 1
   char* dum = (char*)block - 4;
   int size = *((int*)dum);
   if (newsize <= size) return block;
 #endif
-  void* dummy = getBlock( newsize );
+  dummy = getBlock( newsize );
   memcpy( dummy, block, newsize < oldsize ? newsize : oldsize );
   freeBlock( block, oldsize );
   return dummy;

factory-2.0.5-gcc34.patch:

Index: factory-2.0.5-gcc34.patch
===================================================================
RCS file: factory-2.0.5-gcc34.patch
diff -N factory-2.0.5-gcc34.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ factory-2.0.5-gcc34.patch	7 Sep 2005 14:14:58 -0000	1.3
@@ -0,0 +1,22 @@
+diff -Nur factory-orig/fac_cantzass.cc factory/fac_cantzass.cc
+--- factory-orig/fac_cantzass.cc	2003-02-14 16:53:27.000000000 +0100
++++ factory/fac_cantzass.cc	2004-10-06 22:17:06.453105368 +0200
+@@ -83,10 +83,14 @@
+             G = distinctDegreeFactorFFGF( i.getItem().factor(), q );
+         for ( j = G; j.hasItem(); ++j ) {
+             if ( numext > 0 ) {
+-                if ( numext == 1 )
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha ) );
+-                else
+-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, AlgExtRandomF( alpha, beta ) );
++	      if ( numext == 1 ) {
++		    AlgExtRandomF tmpalpha( alpha );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalpha );
++	      }
++	      else {
++		    AlgExtRandomF tmpalphabeta( alpha, beta );
++                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalphabeta );
++	      }
+             }
+             else  if ( galoisfield )
+                 HH = CantorZassenhausFactorFFGF( j.getItem().factor(), j.getItem().exp(), q, GFRandom() );