From owner-svn-src-head@freebsd.org  Thu May 12 22:13:14 2016
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 2B2E8B38E8C;
 Thu, 12 May 2016 22:13:14 +0000 (UTC) (envelope-from cem@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 EA2FE1343;
 Thu, 12 May 2016 22:13:13 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CMDDQq077351;
 Thu, 12 May 2016 22:13:13 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CMDDxE077350;
 Thu, 12 May 2016 22:13:13 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201605122213.u4CMDDxE077350@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Thu, 12 May 2016 22:13:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299574 - head/include
X-SVN-Group: head
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.22
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: Thu, 12 May 2016 22:13:14 -0000

Author: cem
Date: Thu May 12 22:13:12 2016
New Revision: 299574
URL: https://svnweb.freebsd.org/changeset/base/299574

Log:
  stdio.h: Fix function-type typedef style and use _types.h __ssize_t
  
  I'm still not sure why only Pypy runs into the error with the function
  typedefs.  Fix it anyway.
  
  Use __ssize_t instead of ssize_t for the types; it's possible for the size_t
  type to not be visible if at the wrong POSIX_VISIBLE level.
  
  A final (crossing my fingers) follow-up to r299456.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/include/stdio.h

Modified: head/include/stdio.h
==============================================================================
--- head/include/stdio.h	Thu May 12 21:35:40 2016	(r299573)
+++ head/include/stdio.h	Thu May 12 22:13:12 2016	(r299574)
@@ -432,10 +432,10 @@ FILE	*funopen(const void *,
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
 
-typedef ssize_t (cookie_read_function_t)(void *, char *, size_t);
-typedef ssize_t (cookie_write_function_t)(void *, const char *, size_t);
-typedef int (cookie_seek_function_t)(void *, off64_t *, int);
-typedef int (cookie_close_function_t)(void *);
+typedef __ssize_t cookie_read_function_t(void *, char *, size_t);
+typedef __ssize_t cookie_write_function_t(void *, const char *, size_t);
+typedef int cookie_seek_function_t(void *, off64_t *, int);
+typedef int cookie_close_function_t(void *);
 typedef struct {
 	cookie_read_function_t	*read;
 	cookie_write_function_t	*write;