diff options
| author | Andrew O. Shadoura <bugzilla@tut.by> | 2011-04-18 14:42:39 +0300 |
|---|---|---|
| committer | Andrew O. Shadoura <bugzilla@tut.by> | 2011-04-18 14:42:39 +0300 |
| commit | fb5e21309841da9ba0c6a83e4a8965b7bc1770ac (patch) | |
| tree | 0ad61d21f6f2f259002700c2fa812cedbca1ab78 /debian | |
| parent | 8fef0db131cd4bc4d04ab1a05d525e33c4c9f67e (diff) | |
our users don't need to have mowgli.h; hide include from them (plus fix the example)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/07-fix-libguess.h.diff | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/07-fix-libguess.h.diff b/debian/patches/07-fix-libguess.h.diff new file mode 100644 index 0000000..6f14463 --- /dev/null +++ b/debian/patches/07-fix-libguess.h.diff @@ -0,0 +1,34 @@ +Description: our users don't need to depend on mowgli.h + move the #include <mowgli.h> under LIBGUESS_CORE; + also, that revealed a bug in guessconv.c, which implicitly + depended on unistd.h +Author: Andrew O. Shadoura <bugzilla@tut.by> +Bug: http://jira.atheme.org/browse/LG-5 +diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h +--- a/src/libguess/libguess.h ++++ b/src/libguess/libguess.h +@@ -40,11 +40,12 @@ + + #include <stdlib.h> + #include <string.h> +-#include <mowgli.h> + + /* prototypes */ + #ifdef LIBGUESS_CORE + ++#include <mowgli.h> ++ + #include "autoconf.h" + + const char *guess_jp(const char *buf, int buflen); +diff --git a/src/examples/guessconv/guessconv.c b/src/examples/guessconv/guessconv.c +--- a/src/examples/guessconv/guessconv.c ++++ b/src/examples/guessconv/guessconv.c +@@ -34,6 +34,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + #include <libguess.h> + #include <iconv.h> + #include <errno.h> diff --git a/debian/patches/series b/debian/patches/series index 07c756e..2ce2722 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 03-use-format.diff 05-fix-dfa.hg57d6709f5ff5.diff 06-run-tests.diff +07-fix-libguess.h.diff |