From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:16:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB97D16A4D0; Wed, 24 Dec 2003 11:16:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A72D016A4CE for ; Wed, 24 Dec 2003 11:16:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA35343D1D for ; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOJGT0B029248 for ; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOJGTJk029245 for perforce@freebsd.org; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 11:16:29 -0800 (PST) Message-Id: <200312241916.hBOJGTJk029245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Dec 2003 19:16:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44288 Change 44288 by sam@sam_ebb on 2003/12/24 11:15:35 IFC to fix build Affected files ... .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#5 integrate .. //depot/projects/netperf+sockets/sys/sys/sysproto.h#5 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/kern/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.163 2003/12/24 18:47:42 alfred Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.164 2003/12/24 19:09:45 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -80,14 +80,14 @@ 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ - struct sockaddr * __restrict from, \ - __socklen_t * __restrict fromlenaddr); } -30 MSTD { int accept(int s, struct sockaddr * __restrict name, \ - __socklen_t * __restrict *anamelen); } -31 MSTD { int getpeername(int fdes, struct sockaddr * __restrict asa, \ - __socklen_t * __restrict *alen); } -32 MSTD { int getsockname(int fdes, struct sockaddr * __restrict asa, \ - __socklen_t * __restrict *alen); } + struct sockaddr * from, \ + __socklen_t * fromlenaddr); } +30 MSTD { int accept(int s, struct sockaddr * name, \ + __socklen_t *anamelen); } +31 MSTD { int getpeername(int fdes, struct sockaddr * asa, \ + __socklen_t *alen); } +32 MSTD { int getsockname(int fdes, struct sockaddr * asa, \ + __socklen_t *alen); } 33 STD { int access(char *path, int flags); } 34 STD { int chflags(char *path, int flags); } 35 STD { int fchflags(int fd, int flags); } ==== //depot/projects/netperf+sockets/sys/sys/sysproto.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.145 2003/12/24 18:52:09 alfred Exp $ + * $FreeBSD: src/sys/sys/sysproto.h,v 1.146 2003/12/24 19:10:16 alfred Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.163 2003/12/24 18:47:42 alfred Exp */ @@ -138,23 +138,23 @@ char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char from_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict from; char from_r_[PADR_(struct sockaddr *__restrict)]; - char fromlenaddr_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *__restrict)]; + char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)]; + char fromlenaddr_l_[PADL_(__socklen_t *)]; __socklen_t * fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *)]; }; struct accept_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict name; char name_r_[PADR_(struct sockaddr *__restrict)]; - char anamelen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * anamelen; char anamelen_r_[PADR_(__socklen_t *__restrict *)]; + char name_l_[PADL_(struct sockaddr *)]; struct sockaddr * name; char name_r_[PADR_(struct sockaddr *)]; + char anamelen_l_[PADL_(__socklen_t *)]; __socklen_t * anamelen; char anamelen_r_[PADR_(__socklen_t *)]; }; struct getpeername_args { char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)]; - char alen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * alen; char alen_r_[PADR_(__socklen_t *__restrict *)]; + char asa_l_[PADL_(struct sockaddr *)]; struct sockaddr * asa; char asa_r_[PADR_(struct sockaddr *)]; + char alen_l_[PADL_(__socklen_t *)]; __socklen_t * alen; char alen_r_[PADR_(__socklen_t *)]; }; struct getsockname_args { char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)]; - char alen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * alen; char alen_r_[PADR_(__socklen_t *__restrict *)]; + char asa_l_[PADL_(struct sockaddr *)]; struct sockaddr * asa; char asa_r_[PADR_(struct sockaddr *)]; + char alen_l_[PADL_(__socklen_t *)]; __socklen_t * alen; char alen_r_[PADR_(__socklen_t *)]; }; struct access_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];