0001-throw-in-funcdef.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. No __THROW in function implementation.
  17. --jsaw
  18. --- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100
  19. +++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100
  20. @@ -560,17 +560,17 @@
  21. # endif
  22. # ifndef ARGP_EI
  23. -# define ARGP_EI extern __inline__
  24. +# define ARGP_EI extern inline
  25. # endif
  26. ARGP_EI void
  27. -__argp_usage (__const struct argp_state *__state) __THROW
  28. +__argp_usage (__const struct argp_state *__state)
  29. {
  30. __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
  31. }
  32. ARGP_EI int
  33. -__option_is_short (__const struct argp_option *__opt) __THROW
  34. +__option_is_short (__const struct argp_option *__opt)
  35. {
  36. if (__opt->flags & OPTION_DOC)
  37. return 0;
  38. @@ -582,7 +582,7 @@
  39. }
  40. ARGP_EI int
  41. -__option_is_end (__const struct argp_option *__opt) __THROW
  42. +__option_is_end (__const struct argp_option *__opt)
  43. {
  44. return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
  45. }
  46. --- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100
  47. +++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100
  48. @@ -1290,13 +1290,13 @@
  49. /* Defined here, in case a user is not inlining the definitions in
  50. * argp.h */
  51. void
  52. -__argp_usage (__const struct argp_state *__state) __THROW
  53. +__argp_usage (__const struct argp_state *__state)
  54. {
  55. __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
  56. }
  57. int
  58. -__option_is_short (__const struct argp_option *__opt) __THROW
  59. +__option_is_short (__const struct argp_option *__opt)
  60. {
  61. if (__opt->flags & OPTION_DOC)
  62. return 0;
  63. @@ -1310,7 +1310,7 @@
  64. }
  65. int
  66. -__option_is_end (__const struct argp_option *__opt) __THROW
  67. +__option_is_end (__const struct argp_option *__opt)
  68. {
  69. return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
  70. }