diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 09:10:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-12 09:10:19 +0200 |
| commit | 25bc3b2e30deaee00fcf183e885378a0d64ae94c (patch) | |
| tree | 9003917ec023600f4e2916a5907d5a35856b928e /runtime/net.c | |
| parent | 62e00d7a1c1d0301d50e7a28cb84563d61410ecd (diff) | |
| parent | 5ef852f4a3f030f61254a963b0d2dca290933e3c (diff) | |
| download | rsyslog-25bc3b2e30deaee00fcf183e885378a0d64ae94c.tar.gz rsyslog-25bc3b2e30deaee00fcf183e885378a0d64ae94c.tar.bz2 rsyslog-25bc3b2e30deaee00fcf183e885378a0d64ae94c.zip | |
Merge branch 'v4-stable-solaris' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/omfile.c
tools/syslogd.c
Diffstat (limited to 'runtime/net.c')
| -rw-r--r-- | runtime/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/net.c b/runtime/net.c index e91c8a7f..fe6eef5b 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -1010,8 +1010,8 @@ static int should_use_so_bsdcompat(void) { #ifndef OS_BSD - static int init_done; - static int so_bsdcompat_is_obsolete; + static int init_done = 0; + static int so_bsdcompat_is_obsolete = 0; if (!init_done) { struct utsname myutsname; |