mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

58 lines
1.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/gsl/k6_k7.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./ode-initval/rk8pd.c.orig Sat Dec 1 15:10:29 2001
  20. +++ ./ode-initval/rk8pd.c Sat Dec 1 15:13:07 2001
  21. @@ -30,6 +30,10 @@
  22. #include "odeiv_util.h"
  23. +/* undefine k6 and k7 if set (here are variables with such a name) */
  24. +#undef k6
  25. +#undef k7
  26. +
  27. /* Prince-Dormand constants */
  28. static const double Abar[] = {
  29. --- ./ode-initval/rkck.c.orig Tue Jun 12 13:12:36 2001
  30. +++ ./ode-initval/rkck.c Sat Dec 1 15:14:35 2001
  31. @@ -30,6 +30,10 @@
  32. #include "odeiv_util.h"
  33. +/* undefine k6 and k7 if set (here are variables with such a name) */
  34. +#undef k6
  35. +#undef k7
  36. +
  37. /* Cash-Karp constants */
  38. static const double ah[] = { 1.0 / 5.0, 0.3, 3.0 / 5.0, 1.0, 7.0 / 8.0 };
  39. static const double b21 = 1.0 / 5.0;
  40. --- ./ode-initval/rkf45.c.orig Sat Dec 1 15:39:22 2001
  41. +++ ./ode-initval/rkf45.c Sat Dec 1 15:40:02 2001
  42. @@ -32,6 +32,10 @@
  43. #include "odeiv_util.h"
  44. +/* undefine k6 and k7 if set (here are variables with such a name) */
  45. +#undef k6
  46. +#undef k7
  47. +
  48. /* Runge-Kutta-Fehlberg coefficients. Zero elements left out */
  49. static const double ah[] = { 1.0/4.0, 3.0/8.0, 12.0/13.0, 1.0, 1.0/2.0 };