Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/deprecate-int-types'

Browse source 
* origin/topic/timw/deprecate-int-types:
  Deprecate the internal int/uint types in favor of the cstdint types they were based on

Merge adjustments:
  * A bpf type mistakenly got replaced (inside an unlikely #ifdef)
  * Did a few substitutions that got missed (likely due to
    pre-processing out of DEBUG macros)
This commit is contained in:
Jon Siwek 2019-08-14 15:38:02 -07:00
commit 47235b57a6
222 changed files with 1343 additions and 1327 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main.cc
View file

@ -1064,8 +1064,8 @@ int main(int argc, char** argv)
double time_net_start = current_time(true);;
uint64 mem_net_start_total;
uint64 mem_net_start_malloced;
uint64_t mem_net_start_total;
uint64_t mem_net_start_malloced;
if ( time_bro )
{
@ -1082,8 +1082,8 @@ int main(int argc, char** argv)
double time_net_done = current_time(true);;
uint64 mem_net_done_total;
uint64 mem_net_done_malloced;
uint64_t mem_net_done_total;
uint64_t mem_net_done_malloced;
if ( time_bro )
{