diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-05-31 17:31:32 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-01 00:42:31 +0000 |
| commit | d67e305c49c632a9c9feb9c38a29c3066a2a6954 (patch) | |
| tree | bddcd2ec1871bd6d4db6e978249655403fb08173 /epan | |
| parent | 8f1efa9c095f8618287e4a610f73b426a360f6b2 (diff) | |
Pick up some updates from Jeff Morris' abandoned change.
See change Ia3810fe228b497d888d825f8b606078e2f71be65.
Change-Id: Ia6df3434e31a4364bb867a978ee0f89738c19e9d
Reviewed-on: https://code.wireshark.org/review/15665
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/nghttp2/README.nghttp2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/nghttp2/README.nghttp2 b/epan/nghttp2/README.nghttp2 index 4c77a872ab..a9774b2561 100644 --- a/epan/nghttp2/README.nghttp2 +++ b/epan/nghttp2/README.nghttp2 @@ -25,12 +25,15 @@ Change ntoh[ls], hton[ls] to use g_ntoh[ls], g_hton[ls] from glib 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 +Use glib.h and not nghttp2_net.h for ntoh/hton 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.h +Rename free function to free_func in nghttp2_mem.[ch] to avoid shadowing +standard C free() function from stdlib.h + +In nghttp2/nghttp2.h Add on the top #include <config.h> |