Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into hardened/current/…
Browse files Browse the repository at this point in the history
…master
  • Loading branch information
lattera committed Jan 18, 2017
2 parents 10c0310 + 7c0bc68 commit 2108b0d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sys/sys/socket.h
Expand Up @@ -446,7 +446,7 @@ struct msghdr {
#endif
#ifdef _KERNEL
#define MSG_SOCALLBCK 0x10000 /* for use by socket callbacks - soreceive (TCP) */
#define MSG_MORETOCOME 0x20000 /* additional data pending */
#define MSG_MORETOCOME 0x100000 /* additional data pending */
#endif

/*
Expand Down

0 comments on commit 2108b0d

Please sign in to comment.