Merge remote-tracking branch 'origin/master' into topic/jsiwek/doc-framework

This commit is contained in:
Jon Siwek 2011-03-02 14:54:06 -06:00
commit f7d031ed60
90 changed files with 2819 additions and 1456 deletions

View file

@ -8,6 +8,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <string.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
@ -424,7 +425,7 @@ int main(int argc, char** argv)
prog = argv[0];
prefixes.append(""); // "" = "no prefix"
prefixes.append(strdup("")); // "" = "no prefix"
char* p = getenv("BRO_PREFIXES");
if ( p )