security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

g10,tools: Fix bzlib.h include order.

Browse Source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-11 13:52:19 +09:00
parent f079822b2c
commit 03d77b60be
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/compress-bz2.c
View File

@ -20,10 +20,11 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include <stdio.h> /* Early versions of bzlib (1.0) require stdio.h */ #include <stdio.h> /* Early versions of bzlib (1.0) require stdio.h */
#include <bzlib.h>
#include "gpg.h" #include "gpg.h"
#include "../common/util.h" #include "../common/util.h"
#include <bzlib.h>
#include "packet.h" #include "packet.h"
#include "filter.h" #include "filter.h"
#include "main.h" #include "main.h"

7
tools/gpgsplit.c
View File

@ -32,9 +32,6 @@
#ifdef HAVE_ZIP #ifdef HAVE_ZIP
# include <zlib.h> # include <zlib.h>
#endif #endif
#ifdef HAVE_BZIP2
# include <bzlib.h>
#endif /* HAVE_BZIP2 */
#if defined(__riscos__) && defined(USE_ZLIBRISCOS) #if defined(__riscos__) && defined(USE_ZLIBRISCOS)
# include "zlib-riscos.h" # include "zlib-riscos.h"
#endif #endif
@ -43,6 +40,10 @@
#include "../common/util.h" #include "../common/util.h"
#include "../common/openpgpdefs.h" #include "../common/openpgpdefs.h"
#ifdef HAVE_BZIP2
# include <bzlib.h>
#endif /* HAVE_BZIP2 */
static int opt_verbose; static int opt_verbose;
static const char *opt_prefix = ""; static const char *opt_prefix = "";
static int opt_uncompress; static int opt_uncompress;