diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-08-16 22:21:59 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-08-23 21:33:09 +0000 |
| commit | 640382c74364f61da36bdc5b1272e8cda28f1d8f (patch) | |
| tree | 60c64cb62d309f1f978f68714e11397f88e21d29 /file.c | |
| parent | 505bcefd20501ae0811f6074f2113b52788d78c5 (diff) | |
| download | wireshark-640382c74364f61da36bdc5b1272e8cda28f1d8f.tar.gz | |
CMake: Allow setting per target compiler warnings
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>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3339,7 +3339,7 @@ match_regex(capture_file *cf, frame_data *fdata, void *criterion _U_) return MR_ERROR; } - if (g_regex_match_full(cf->regex, ws_buffer_start_ptr(&cf->buf), fdata->cap_len, + if (g_regex_match_full(cf->regex, (const gchar *)ws_buffer_start_ptr(&cf->buf), fdata->cap_len, 0, (GRegexMatchFlags) 0, &match_info, NULL)) { gint start_pos = 0, end_pos = 0; @@ -4024,7 +4024,7 @@ cf_set_frame_edited(capture_file *cf, frame_data *fd, modified_frame_data *mfd = (modified_frame_data *)g_malloc(sizeof(modified_frame_data)); mfd->phdr = *phdr; - mfd->pd = pd; + mfd->pd = (char *)pd; if (cf->edited_frames == NULL) cf->edited_frames = g_tree_new_full(g_direct_compare_func, NULL, NULL, |