diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-05-15 18:54:49 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-05-17 15:02:42 +0000 |
| commit | bcc3912a73aab3ce8990a15a0b939348e3f55608 (patch) | |
| tree | 69b4dddaef63911228d8c32a4843a8abb543d411 | |
| parent | 53b7a059a255966820e6198911704c49e0e4f410 (diff) | |
| download | wireshark-bcc3912a73aab3ce8990a15a0b939348e3f55608.tar.gz | |
nghttp2: use <> for include glib.h
Change-Id: I6fdb72322dca514a774ab074c26128f70992a8f7
Reviewed-on: https://code.wireshark.org/review/8476
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/nghttp2/README.nghttp2 | 2 | ||||
| -rw-r--r-- | epan/nghttp2/nghttp2_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/nghttp2/README.nghttp2 b/epan/nghttp2/README.nghttp2 index 1b13871221..6aedd6441e 100644 --- a/epan/nghttp2/README.nghttp2 +++ b/epan/nghttp2/README.nghttp2 @@ -25,7 +25,7 @@ find . -name "nghttp2*" -type f -exec sed -i 's/ntoh/g_ntoh/g' {} \; find . -name "nghttp2*" -type f -exec sed -i 's/hton/g_hton/g' {} \; Use glib.h and no nghttp2_net.h for ntoh/hton -find . -name "nghttp2*" -type f -exec sed -i 's/"nghttp2_net.h"/"glib.h"/g' {} \; +find . -name "nghttp2*" -type f -exec sed -i 's/"nghttp2_net.h"/<glib.h>/g' {} \; Fix c++-compat error and documentation (struct => typedef) error diff --git a/epan/nghttp2/nghttp2_helper.c b/epan/nghttp2/nghttp2_helper.c index 7fa90a1e26..d385853791 100644 --- a/epan/nghttp2/nghttp2_helper.c +++ b/epan/nghttp2/nghttp2_helper.c @@ -27,7 +27,7 @@ #include <assert.h> #include <string.h> -#include "glib.h" +#include <glib.h> void nghttp2_put_uint16be(uint8_t *buf, uint16_t n) { uint16_t x = g_htons(n); |