Merge two upstream patches from vendor branch. No functional changes.
This commit is contained in:
commit
faa715d30c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=221487
@ -1,6 +1,7 @@
|
|||||||
20110403
|
20110403
|
||||||
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
|
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
|
||||||
[contrib/suse/openssh.spec] Prepare for 5.8p2 release.
|
[contrib/suse/openssh.spec] Prepare for 5.8p2 release.
|
||||||
|
- (djm) [version.h] crank version
|
||||||
- Release 5.8p2
|
- Release 5.8p2
|
||||||
|
|
||||||
20110329
|
20110329
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#ifndef _DEFINES_H
|
#ifndef _DEFINES_H
|
||||||
#define _DEFINES_H
|
#define _DEFINES_H
|
||||||
|
|
||||||
/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */
|
/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/* Constants */
|
/* Constants */
|
||||||
@ -45,6 +45,7 @@ enum
|
|||||||
/*
|
/*
|
||||||
* Definitions for IP type of service (ip_tos)
|
* Definitions for IP type of service (ip_tos)
|
||||||
*/
|
*/
|
||||||
|
#include <netinet/in_systm.h>
|
||||||
#include <netinet/ip.h>
|
#include <netinet/ip.h>
|
||||||
#ifndef IPTOS_LOWDELAY
|
#ifndef IPTOS_LOWDELAY
|
||||||
# define IPTOS_LOWDELAY 0x10
|
# define IPTOS_LOWDELAY 0x10
|
||||||
@ -57,7 +58,6 @@ enum
|
|||||||
/*
|
/*
|
||||||
* Definitions for DiffServ Codepoints as per RFC2474
|
* Definitions for DiffServ Codepoints as per RFC2474
|
||||||
*/
|
*/
|
||||||
#include <netinet/in_systm.h>
|
|
||||||
#ifndef IPTOS_DSCP_AF11
|
#ifndef IPTOS_DSCP_AF11
|
||||||
# define IPTOS_DSCP_AF11 0x28
|
# define IPTOS_DSCP_AF11 0x28
|
||||||
# define IPTOS_DSCP_AF12 0x30
|
# define IPTOS_DSCP_AF12 0x30
|
||||||
|
Loading…
Reference in New Issue
Block a user