Merge branch 'master' into 1.1
Conflicts: NEWS README configure.in src/net.c src/net.h
This commit is contained in:
commit
79e46d08a4
14 changed files with 96 additions and 25 deletions
|
@ -45,6 +45,10 @@
|
|||
#define ICMP_NET_UNREACH 0
|
||||
#endif
|
||||
|
||||
#ifndef ICMP_NET_ANO
|
||||
#define ICMP_NET_ANO 9
|
||||
#endif
|
||||
|
||||
#ifndef IP_MSS
|
||||
#define IP_MSS 576
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue