Merge branch 'master' into topic/jsiwek/file-analysis

This commit is contained in:
Jon Siwek 2013-03-11 13:20:45 -05:00
commit 1f6cac9b6d
37 changed files with 114 additions and 225 deletions

View file

@ -76,7 +76,7 @@ typedef int32 ptr_compat_int;
#define PRI_PTR_COMPAT_INT PRId32
#define PRI_PTR_COMPAT_UINT PRIu32
#else
# error "Unusual pointer size. Please report to bro@bro-ids.org."
# error "Unusual pointer size. Please report to bro@bro.org."
#endif
extern "C"