diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-11 04:52:19 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-11 04:52:19 +0000 |
| commit | 03d77b60befa4e2f8437a80ac429cca3e54688f8 (patch) | |
| tree | 043fe6c91f2a7de03091f2ab610d5bea70e9b937 | |
| parent | g10: Minor clean up for TOFU. (diff) | |
| download | gnupg-03d77b60befa4e2f8437a80ac429cca3e54688f8.tar.gz gnupg-03d77b60befa4e2f8437a80ac429cca3e54688f8.zip | |
g10,tools: Fix bzlib.h include order.
* g10/compress-bz2.c: Include bzlib.h after gcrypt.h.
* tools/gpgsplit.c: Likewise.
--
bzlib.h may include windows.h on Windows. It is better
after gcrypt.h which may include winsock2.h.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/compress-bz2.c | 3 | ||||
| -rw-r--r-- | tools/gpgsplit.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c index 4adca9b37..45aa40dfc 100644 --- a/g10/compress-bz2.c +++ b/g10/compress-bz2.c @@ -20,10 +20,11 @@ #include <config.h> #include <string.h> #include <stdio.h> /* Early versions of bzlib (1.0) require stdio.h */ -#include <bzlib.h> #include "gpg.h" #include "../common/util.h" +#include <bzlib.h> + #include "packet.h" #include "filter.h" #include "main.h" diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c index ce2777d3a..b9787b182 100644 --- a/tools/gpgsplit.c +++ b/tools/gpgsplit.c @@ -32,9 +32,6 @@ #ifdef HAVE_ZIP # include <zlib.h> #endif -#ifdef HAVE_BZIP2 -# include <bzlib.h> -#endif /* HAVE_BZIP2 */ #if defined(__riscos__) && defined(USE_ZLIBRISCOS) # include "zlib-riscos.h" #endif @@ -43,6 +40,10 @@ #include "../common/util.h" #include "../common/openpgpdefs.h" +#ifdef HAVE_BZIP2 +# include <bzlib.h> +#endif /* HAVE_BZIP2 */ + static int opt_verbose; static const char *opt_prefix = ""; static int opt_uncompress; |