package/scientific/gsl/k6_k7.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gsl/k6_k7.patch
   5 # Copyright (C) 2004 - 2006 The T2 SDE Project
   6 # Copyright (C) 1998 - 2003 ROCK Linux Project
   7 #
   8 # More information can be found in the files COPYING and README.
   9 #
  10 # This patch file is dual-licensed. It is available under the license the
  11 # patched project is licensed under, as long as it is an OpenSource license
  12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13 # of the GNU General Public License as published by the Free Software
  14 # Foundation; either version 2 of the License, or (at your option) any later
  15 # version.
  16 # --- T2-COPYRIGHT-NOTE-END ---
  17
  18 --- ./ode-initval/rk8pd.c.orig  Sat Dec  1 15:10:29 2001
  19 +++ ./ode-initval/rk8pd.c       Sat Dec  1 15:13:07 2001
  20 @@ -30,6 +30,10 @@
  21
  22  #include "odeiv_util.h"
  23
  24 +/* undefine k6 and k7 if set (here are variables with such a name) */
  25 +#undef k6
  26 +#undef k7
  27 +
  28  /* Prince-Dormand constants */
  29
  30  static const double Abar[] = {
  31 --- ./ode-initval/rkck.c.orig   Tue Jun 12 13:12:36 2001
  32 +++ ./ode-initval/rkck.c        Sat Dec  1 15:14:35 2001
  33 @@ -30,6 +30,10 @@
  34
  35  #include "odeiv_util.h"
  36
  37 +/* undefine k6 and k7 if set (here are variables with such a name) */
  38 +#undef k6
  39 +#undef k7
  40 +
  41  /* Cash-Karp constants */
  42  static const double ah[] = { 1.0 / 5.0, 0.3, 3.0 / 5.0, 1.0, 7.0 / 8.0 };
  43  static const double b21 = 1.0 / 5.0;
  44 --- ./ode-initval/rkf45.c.orig  2004-12-02 18:54:19.000000000 -0300
  45 +++ ./ode-initval/rkf45.c       2005-02-08 16:54:27.700501964 -0300
  46 @@ -32,6 +32,10 @@
  47
  48  #include "odeiv_util.h"
  49
  50 +/* undefine k6 and k7 if set (here are variables with such a name) */
  51 +#undef k6
  52 +#undef k7
  53 +
  54  /* Runge-Kutta-Fehlberg coefficients. Zero elements left out */
  55
  56  static const double ah[] = { 1.0/4.0, 3.0/8.0, 12.0/13.0, 1.0, 1.0/2.0 };