From owner-p4-projects@FreeBSD.ORG Fri Oct 15 06:25:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B8D1065679; Fri, 15 Oct 2010 06:25:56 +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 4512E106566B for ; Fri, 15 Oct 2010 06:25:56 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 17DC08FC14 for ; Fri, 15 Oct 2010 06:25:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9F6Ptek014414 for ; Fri, 15 Oct 2010 06:25:55 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9F6Ptlq014411 for perforce@freebsd.org; Fri, 15 Oct 2010 06:25:55 GMT (envelope-from stas@freebsd.org) Date: Fri, 15 Oct 2010 06:25:55 GMT Message-Id: <201010150625.o9F6Ptlq014411@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Oct 2010 06:25:56 -0000 http://p4web.freebsd.org/@@184756?ac=10 Change 184756 by stas@stas_orion on 2010/10/15 06:25:27 - Fix structure definitions for shmat. PR: ports/149621 Reported by: Stephen Sanders Affected files ... .. //depot/projects/valgrind/include/vki/vki-freebsd.h#21 edit Differences ... ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#21 (text+ko) ==== @@ -1232,22 +1232,6 @@ char machine[VKI_SYS_NMLN]; /* Hardware type. */ }; -//---------------------------------------------------------------------- -// From sys/ipc.h -//---------------------------------------------------------------------- - -/* Obsolete, used only for backwards compatibility and libc5 compiles */ -struct vki_ipc_perm -{ - vki_uint16_t cuid; - vki_uint16_t cgid; - vki_uint16_t uid; - vki_uint16_t gid; - vki_uint16_t mode; - vki_uint16_t seq; - vki_uint16_t key; -}; - #define VKI_IPC_CREAT 00001000 /* create if key is nonexistent */ #define VKI_IPC_EXCL 00002000 /* fail if key exists */ #define VKI_IPC_NOWAIT 00004000 /* return error on wait */ @@ -1257,7 +1241,16 @@ #define VKI_IPC_STAT 2 /* get ipc_perm options */ #define VKI_IPC_INFO 3 /* see ipcs */ -// not here #define VKI_IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger message sizes, etc. */ +struct vki_ipc_perm +{ + vki_uid_t cuid; + vki_gid_t cgid; + vki_uid_t uid; + vki_gid_t gid; + vki_mode_t mode; + unsigned short seq; + vki_key_t key; +}; //---------------------------------------------------------------------- // From sys/sem.h @@ -1491,14 +1484,13 @@ struct vki_shmid_ds { struct vki_ipc_perm shm_perm; /* operation perms */ - vki_int32_t shm_segsz; /* size of segment (bytes) */ + vki_size_t shm_segsz; /* size of segment (bytes) */ vki_pid_t shm_lpid; /* pid of last operator */ vki_pid_t shm_cpid; /* pid of creator */ - vki_int16_t shm_nattch; /* no. of current attaches */ + int shm_nattch; /* no. of current attaches */ vki_time_t shm_atime; /* last attach time */ vki_time_t shm_dtime; /* last detach time */ vki_time_t shm_ctime; /* last change time */ - void *shm_internal; }; #define VKI_SHM_RDONLY 010000 /* read-only access */