Merge branch 'master' into topic/gilbert/rand-pool

This commit is contained in:
Gilbert Clark gc355804@ohio.edu 2011-08-14 22:21:59 -07:00
commit d46525dcca
102 changed files with 1543 additions and 542 deletions

View file

@ -179,7 +179,7 @@ extern const char* bro_path();
extern const char* bro_prefixes();
std::string dot_canon(std::string path, std::string file, std::string prefix = "");
const char* normalize_path(const char* path);
void get_policy_subpath(const char* dir, const char* file, const char** subpath);
void get_script_subpath(const std::string& full_filename, const char** subpath);
extern FILE* search_for_file(const char* filename, const char* ext,
const char** full_filename, bool load_pkgs, const char** bropath_subpath);