[git] GnuPG - branch, master, updated. gnupg-2.1.20-46-g03d77b6

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  03d77b60befa4e2f8437a80ac429cca3e54688f8 (commit)
      from  f079822b2ce06c18b7ea45efed2d29b54e38f04d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03d77b60befa4e2f8437a80ac429cca3e54688f8
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 11 13:52:19 2017 +0900

    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 <gniibe at fsij.org>

diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index 4adca9b..45aa40d 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 ce2777d..b9787b1 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;

-----------------------------------------------------------------------

Summary of changes:
 g10/compress-bz2.c | 3 ++-
 tools/gpgsplit.c   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org