forked from osmocom/wireshark
![]() Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> |
||
---|---|---|
.. | ||
.editorconfig | ||
CMakeLists.txt | ||
Makefile.am | ||
README.nghttp2 | ||
nghttp2.h | ||
nghttp2_buf.c | ||
nghttp2_buf.h | ||
nghttp2_hd.c | ||
nghttp2_hd.h | ||
nghttp2_hd_huffman.c | ||
nghttp2_hd_huffman.h | ||
nghttp2_hd_huffman_data.c | ||
nghttp2_helper.c | ||
nghttp2_helper.h | ||
nghttp2_int.h | ||
nghttp2_mem.c | ||
nghttp2_mem.h | ||
nghttp2_rcbuf.c | ||
nghttp2_rcbuf.h | ||
nghttp2ver.h |
README.nghttp2
Code from nghttp2 library ( https://github.com/tatsuhiro-t/nghttp2) Thanks for Tatsuhiro Tsujikawa for permission to use nghttp2 lib. Update library from source download (clone) last release of nghttp2 and in folder epan/nghttp2 copy following file cp ../../../nghttp2/lib/nghttp2_buf.[ch] . cp ../../../nghttp2/lib/nghttp2_hd*.[ch] . cp ../../../nghttp2/lib/nghttp2_helper.[ch] . cp ../../../nghttp2/lib/nghttp2_int.h . cp ../../../nghttp2/lib/nghttp2_mem.[ch] . cp ../../../nghttp2/lib/nghttp2_rcbuf.[ch] . cp ../../../nghttp2/lib/includes/nghttp2/nghttp2.h . cp ../../../nghttp2/lib/includes/nghttp2/nghttp2ver.h . Change path to nghttp2.h find . -name "nghttp2*" -type f -exec sed -i 's/<nghttp2\/nghttp2.h>/<nghttp2.h>/g' {} \; Change path to nghttp2ver.h find . -name "nghttp2*" -type f -exec sed -i 's/<nghttp2\/nghttp2ver.h>/"nghttp2ver.h"/g' {} \; 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 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 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> After #define NGHTTP2_EXTERN #endif /* !defined(WIN32) */ Add /* * When we're building this as part of Wireshark, we want to treat * all these routines as internal to libwireshark. */ #include "ws_symbol_export.h" #undef NGHTTP2_EXTERN #define NGHTTP2_EXTERN WS_DLL_LOCAL