diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/e2fsprogs/patches | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/e2fsprogs/patches')
| -rw-r--r-- | package/e2fsprogs/patches/patch-misc_e2undo_c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/e2fsprogs/patches/patch-misc_e2undo_c b/package/e2fsprogs/patches/patch-misc_e2undo_c new file mode 100644 index 000000000..2d1441220 --- /dev/null +++ b/package/e2fsprogs/patches/patch-misc_e2undo_c @@ -0,0 +1,11 @@ + optind seems to need unistd.h, not only getopt.h +--- e2fsprogs-1.41.12.orig/misc/e2undo.c 2010-05-14 00:59:49.000000000 +0200 ++++ e2fsprogs-1.41.12/misc/e2undo.c 2010-10-18 12:03:49.329511558 +0200 +@@ -19,6 +19,7 @@ + #if HAVE_ERRNO_H + #include <errno.h> + #endif ++#include <unistd.h> + #include "ext2fs/tdb.h" + #include "ext2fs/ext2fs.h" + #include "nls-enable.h" |