diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 18:54:53 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-22 01:55:41 +0000 |
| commit | 376dfe847b4f0b5dcea277fb0c570df5b793be79 (patch) | |
| tree | b4e8d114c8706e724e5fa68bf382078788e09735 /echld | |
| parent | 7ba4aef599b9a36c8eb6dfd991fe37ab98319fed (diff) | |
Fix build errors for tfshark and echld.
Some come from the recent version information changes, some were broken
before that.
Change-Id: I9429f7d45d3c51c579aef592b37c79130a443299
Reviewed-on: https://code.wireshark.org/review/2531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'echld')
| -rw-r--r-- | echld/dispatcher.c | 8 | ||||
| -rw-r--r-- | echld/echld-int.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 82155f6965..2286fc630a 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -119,7 +119,7 @@ static long dbg_r = 0; #define DISP_DBG(attrs) ( dispatcher_debug attrs ) #define DISP_DBG_INIT() do { debug_fp = stderr; DCOM(); } while(0) #define DISP_DBG_START(fname) do { debug_fp = fopen(fname,"a"); DCOM(); DISP_DBG((0,"Log Started")); } while(0) -#define DISP_WRITE(FD,BA,CH,T,RH) ( dbg_r = echld_write_frame(FD,BA,CH,T,RH,NULL), DISP_DBG((1,"SND fd=%d ch=%d ty='%s' rh=%d msg='%s'",FD,CH,TY(T),RH, (dbg_r>0?"ok":strerror(errno)))), dbg_r ) +#define DISP_WRITE(FD,BA,CH,T,RH) ( dbg_r = echld_write_frame(FD,BA,CH,T,RH,NULL), DISP_DBG((1,"SND fd=%d ch=%d ty='%s' rh=%d msg='%s'",FD,CH,TY(T),RH, (dbg_r>0?"ok":strerror(errno))))) #define CHLD_SET_STATE(c,st) do { DISP_DBG((1,"Child[%d] State %s => %s",(c)->chld_id, ST((c)->state), ST((st)) )); (c)->state=(st); } while(0) #else #define DISP_DBG(attrs) @@ -486,8 +486,8 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { runtime_info_str = g_string_new("Running "); get_runtime_version_info(runtime_info_str, NULL); - version_long_str = g_strdup_printf("%s%s\n%s\n%s\n%s", - version_str, wireshark_gitversion, get_copyright_info(), + version_long_str = g_strdup_printf("Echld %s\n%s\n%s\n%s", + get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str, runtime_info_str->str); if (error) { @@ -496,7 +496,7 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Echld %s\n%s\n%s", - ws_get_version_info(), comp_info_str->str, runtime_info_str->str); + get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); init_stuff(); diff --git a/echld/echld-int.h b/echld/echld-int.h index 0e04bc2740..29c737bbd9 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -70,6 +70,8 @@ #include "wsutil/privileges.h" #include "wsutil/filesystem.h" #include "wsutil/copyright_info.h" +#include "wsutil/ws_version_info.h" +#include "epan/addr_resolv.h" #include "epan/epan.h" #include "epan/prefs.h" #include "epan/ex-opt.h" |