mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-04 06:54:27 -05:00
389144d701
argp-standalone is required by elfutils, itself required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45967
80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
#
|
|
# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
|
|
# Copyright (C) 2006 The T2 SDE Project
|
|
#
|
|
# More information can be found in the files COPYING and README.
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
No __THROW in function implementation.
|
|
--jsaw
|
|
|
|
--- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100
|
|
+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100
|
|
@@ -560,17 +560,17 @@
|
|
# endif
|
|
|
|
# ifndef ARGP_EI
|
|
-# define ARGP_EI extern __inline__
|
|
+# define ARGP_EI extern inline
|
|
# endif
|
|
|
|
ARGP_EI void
|
|
-__argp_usage (__const struct argp_state *__state) __THROW
|
|
+__argp_usage (__const struct argp_state *__state)
|
|
{
|
|
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
|
}
|
|
|
|
ARGP_EI int
|
|
-__option_is_short (__const struct argp_option *__opt) __THROW
|
|
+__option_is_short (__const struct argp_option *__opt)
|
|
{
|
|
if (__opt->flags & OPTION_DOC)
|
|
return 0;
|
|
@@ -582,7 +582,7 @@
|
|
}
|
|
|
|
ARGP_EI int
|
|
-__option_is_end (__const struct argp_option *__opt) __THROW
|
|
+__option_is_end (__const struct argp_option *__opt)
|
|
{
|
|
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
|
}
|
|
--- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100
|
|
+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100
|
|
@@ -1290,13 +1290,13 @@
|
|
/* Defined here, in case a user is not inlining the definitions in
|
|
* argp.h */
|
|
void
|
|
-__argp_usage (__const struct argp_state *__state) __THROW
|
|
+__argp_usage (__const struct argp_state *__state)
|
|
{
|
|
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
|
}
|
|
|
|
int
|
|
-__option_is_short (__const struct argp_option *__opt) __THROW
|
|
+__option_is_short (__const struct argp_option *__opt)
|
|
{
|
|
if (__opt->flags & OPTION_DOC)
|
|
return 0;
|
|
@@ -1310,7 +1310,7 @@
|
|
}
|
|
|
|
int
|
|
-__option_is_end (__const struct argp_option *__opt) __THROW
|
|
+__option_is_end (__const struct argp_option *__opt)
|
|
{
|
|
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
|
}
|