diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
| commit | e82c6eec6f91e9c212103d81fdd4b10028c9bf6a (patch) | |
| tree | 157a358cdef97a1d5e97e9b446b9bf7ccfa95d26 /net.h | |
| parent | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (diff) | |
| parent | b9198d251218f13803cf121c4ef5f69a0e850d24 (diff) | |
| download | rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.gz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.xz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.zip | |
Merge branch 'bsd-port'
Conflicts:
ChangeLog
plugins/imklog/imklog.c
Diffstat (limited to 'net.h')
| -rw-r--r-- | net.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ #define ADDR_NAME 0x01 /* address is hostname wildcard) */ #define ADDR_PRI6 0x02 /* use IPv6 address prior to IPv4 when resolving */ -#ifdef BSD +#ifdef OS_BSD # ifndef _KERNEL # define s6_addr32 __u6_addr.__u6_addr32 # endif |