summaryrefslogtreecommitdiff
path: root/epan/nghttp2
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-06-24 17:29:15 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-06-24 15:31:07 +0000
commitb7aacfdd467e6b07e88e0afc34ea3efefd98ec8e (patch)
treea3c23c11ef423f68713a0c38af61fe8d1eaca13f /epan/nghttp2
parent69cdfe9410e0bc2a3f22a0b499dad19e2323864a (diff)
downloadwireshark-b7aacfdd467e6b07e88e0afc34ea3efefd98ec8e.tar.gz
libnghttp2: readd remove check for CONFIG.H
i hope will be fixed Windows 32 buildbot Change-Id: Ie4429193d354ff70b4802fa8a734cb35a69c090c Reviewed-on: https://code.wireshark.org/review/9090 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/nghttp2')
-rw-r--r--epan/nghttp2/README.nghttp22
-rw-r--r--epan/nghttp2/nghttp2_helper.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/nghttp2/README.nghttp2 b/epan/nghttp2/README.nghttp2
index 68d0b2c620..ae238333dd 100644
--- a/epan/nghttp2/README.nghttp2
+++ b/epan/nghttp2/README.nghttp2
@@ -29,6 +29,8 @@ find . -name "nghttp2*" -type f -exec sed -i 's/"nghttp2_net.h"/<glib.h>/g' {}
Fix c++-compat error and documentation (struct => typedef) error
+in nghttp2/nghttp2_helper.h remove check for CONFIG.H
+
in nghttp2/nghttp2.h
Add on the top
diff --git a/epan/nghttp2/nghttp2_helper.h b/epan/nghttp2/nghttp2_helper.h
index de2d8c0a14..19595b0cf8 100644
--- a/epan/nghttp2/nghttp2_helper.h
+++ b/epan/nghttp2/nghttp2_helper.h
@@ -25,9 +25,7 @@
#ifndef NGHTTP2_HELPER_H
#define NGHTTP2_HELPER_H
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif /* HAVE_CONFIG_H */
#include <string.h>