From owner-svn-src-head@freebsd.org  Sun Oct 15 02:40:15 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EC01E3663C;
 Sun, 15 Oct 2017 02:40:15 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D168C6682E;
 Sun, 15 Oct 2017 02:40:14 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9F2eDkR051460;
 Sun, 15 Oct 2017 02:40:13 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9F2eDSH051459;
 Sun, 15 Oct 2017 02:40:13 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710150240.v9F2eDSH051459@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 15 Oct 2017 02:40:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324622 - head/include
X-SVN-Group: head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/include
X-SVN-Commit-Revision: 324622
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Oct 2017 02:40:15 -0000

Author: cy
Date: Sun Oct 15 02:40:13 2017
New Revision: 324622
URL: https://svnweb.freebsd.org/changeset/base/324622

Log:
  Sync (make same) the offsetof macro definition in include/ with the
  definition of the same in sys/sys/. The problem was discovered while
  working on implementing a new C11 gets_s() for libc. (The new gets_s()
  requires rsize_t found in include/stddef.h.) The solution to sync the two
  definitions was suggested by ed@ while discussing D12667.
  
  Suggested by:	ed
  MFC after:	2 weeks

Modified:
  head/include/stddef.h

Modified: head/include/stddef.h
==============================================================================
--- head/include/stddef.h	Sat Oct 14 23:25:44 2017	(r324621)
+++ head/include/stddef.h	Sun Oct 15 02:40:13 2017	(r324622)
@@ -70,7 +70,7 @@ typedef	__max_align_t	max_align_t;
 #endif
 #endif
 
-#define	offsetof(type, member)	__offsetof(type, member)
+#define	offsetof(type, field)	__offsetof(type, field)
 
 #if __EXT1_VISIBLE
 /* ISO/IEC 9899:2011 K.3.3.2 */