| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 | |
| 17 | |
| 18 | No __THROW in function implementation. |
| 19 | --jsaw |
| 20 | |
| 21 | Taken from buildroot |
| 22 | |
| 23 | Upstream-Status: Pending |
| 24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 25 | |
| 26 | --- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 |
| 27 | +++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 |
| 28 | @@ -560,17 +560,17 @@ |
| 29 | # endif |
| 30 | |
| 31 | # ifndef ARGP_EI |
| 32 | -# define ARGP_EI extern __inline__ |
| 33 | +# define ARGP_EI extern inline |
| 34 | # endif |
| 35 | |
| 36 | ARGP_EI void |
| 37 | -__argp_usage (__const struct argp_state *__state) __THROW |
| 38 | +__argp_usage (__const struct argp_state *__state) |
| 39 | { |
| 40 | __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); |
| 41 | } |
| 42 | |
| 43 | ARGP_EI int |
| 44 | -__option_is_short (__const struct argp_option *__opt) __THROW |
| 45 | +__option_is_short (__const struct argp_option *__opt) |
| 46 | { |
| 47 | if (__opt->flags & OPTION_DOC) |
| 48 | return 0; |
| 49 | @@ -582,7 +582,7 @@ |
| 50 | } |
| 51 | |
| 52 | ARGP_EI int |
| 53 | -__option_is_end (__const struct argp_option *__opt) __THROW |
| 54 | +__option_is_end (__const struct argp_option *__opt) |
| 55 | { |
| 56 | return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; |
| 57 | } |
| 58 | --- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 |
| 59 | +++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 |
| 60 | @@ -1290,13 +1290,13 @@ |
| 61 | /* Defined here, in case a user is not inlining the definitions in |
| 62 | * argp.h */ |
| 63 | void |
| 64 | -__argp_usage (__const struct argp_state *__state) __THROW |
| 65 | +__argp_usage (__const struct argp_state *__state) |
| 66 | { |
| 67 | __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); |
| 68 | } |
| 69 | |
| 70 | int |
| 71 | -__option_is_short (__const struct argp_option *__opt) __THROW |
| 72 | +__option_is_short (__const struct argp_option *__opt) |
| 73 | { |
| 74 | if (__opt->flags & OPTION_DOC) |
| 75 | return 0; |
| 76 | @@ -1310,7 +1310,7 @@ |
| 77 | } |
| 78 | |
| 79 | int |
| 80 | -__option_is_end (__const struct argp_option *__opt) __THROW |
| 81 | +__option_is_end (__const struct argp_option *__opt) |
| 82 | { |
| 83 | return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; |
| 84 | } |