Ticket #14268: zn_poly-0.9.p11.diff

File zn_poly-0.9.p11.diff, 1.3 KB (added by jdemeyer, 9 years ago)

  • SPKG.txt 

    # HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1363280025 -3600
# Node ID 630a1e2abd61d5627c993b974aa120b3649759ec
# Parent  ad938bd243cf260ef27f070ef2178f048e97144c
Trac #14268: Undo the zn_poly.h.patch from zn_poly-0.9.p8

diff --git a/SPKG.txt b/SPKG.txt
    a b  
    6161
    6262== Changelog ==
    6363
     64=== zn_poly-0.9.p11 (Jeroen Demeyer, 14 March 2013) ===
     65 * Trac #14268: Undo the zn_poly.h.patch from zn_poly-0.9.p8 which
     66   would otherwise conflict with the new FLINT.
     67
    6468=== zn_poly-0.9.p10 ( Francois Bissey, 14 February 2013 ) ===
    6569 * Trac #14098: Fix a potential problem with the tests where values can get out of
    6670   range. The problem occurs only in rare case but the code is more sane that way.

  • patches/zn_poly.h.patch 

    diff --git a/patches/zn_poly.h.patch b/patches/zn_poly.h.patch
    a b  
    1212 #define ULONG_BITS 64
    1313 #else
    1414 #error zn_poly requires that unsigned long is either 32 bits or 64 bits
    15 @@ -69,7 +69,13 @@
    16  /*
    17     I get really sick of typing unsigned long.
    18  */
    19 +#if 0  /* Avoid conflicts with other (equivalent) definitions of 'ulong'. */
    20 +       /* Note that <sys/types.h> might even already have typedef'ed it.  */
    21  typedef unsigned long  ulong;
    22 +#else
    23 +#undef ulong
    24 +#define        ulong   unsigned long
    25 +#endif
    26  
    27  
    28  #include "wide_arith.h"