diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/grub/patches/patch-include_grub_misc_h | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/grub/patches/patch-include_grub_misc_h')
| -rw-r--r-- | package/grub/patches/patch-include_grub_misc_h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/package/grub/patches/patch-include_grub_misc_h b/package/grub/patches/patch-include_grub_misc_h new file mode 100644 index 000000000..463e63dac --- /dev/null +++ b/package/grub/patches/patch-include_grub_misc_h @@ -0,0 +1,17 @@ +--- grub-1.97.1.orig/include/grub/misc.h 2009-11-09 16:48:16.000000000 +0100 ++++ grub-1.97.1/include/grub/misc.h 2009-11-29 12:07:10.920475755 +0100 +@@ -74,14 +74,6 @@ grub_strncat (char *dest, const char *sr + return dest; + } + +-/* Prototypes for aliases. */ +-#ifndef GRUB_UTIL +-int EXPORT_FUNC(memcmp) (const void *s1, const void *s2, grub_size_t n); +-void *EXPORT_FUNC(memmove) (void *dest, const void *src, grub_size_t n); +-void *EXPORT_FUNC(memcpy) (void *dest, const void *src, grub_size_t n); +-void *EXPORT_FUNC(memset) (void *s, int c, grub_size_t n); +-#endif +- + int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n); + int EXPORT_FUNC(grub_strcmp) (const char *s1, const char *s2); + int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, grub_size_t n); |