- merge revision 1.16
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:54:51 +0000 (13:54 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:54:51 +0000 (13:54 +0000)
commit9ec1dbd5a74134ad48eda455ddcbbe1022fdd746
tree698c88eac7beabb2b7d545e02024374a6c3128ab
parent7dcbaf887e84f9c118f235c6a87d1d9d1f05dd7c
- merge revision 1.16
date: 2005/02/01 03:10:21;  author: mlhuang;  state: Exp;  lines: +4 -4
- bound vnet mods by #ifdef
- bound runtime vnet code by if (vnet_active)
include/net/sock.h