From owner-p4-projects@FreeBSD.ORG Sat Aug 16 04:41:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF2221065677; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B038106564A for ; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C6A28FC0A for ; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G4f0TF018466 for ; Sat, 16 Aug 2008 04:41:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G4f0gp018464 for perforce@freebsd.org; Sat, 16 Aug 2008 04:41:00 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 04:41:00 GMT Message-Id: <200808160441.m7G4f0gp018464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 04:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147508 Change 147508 by julian@julian_trafmon1 on 2008/08/16 04:40:06 remove opt_vimage from teh same file in 4 branches I wonder how this will work :-) Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 edit .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -144,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" -#include "opt_vimage.h" #include #include #include @@ -145,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" -#include "opt_vimage.h" #include #include #include @@ -145,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -144,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */