From owner-svn-src-all@FreeBSD.ORG Tue Feb 14 12:50:21 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32FAC10656B5; Tue, 14 Feb 2012 12:50:21 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 17B3A8FC0A; Tue, 14 Feb 2012 12:50:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1ECoKvn099092; Tue, 14 Feb 2012 12:50:20 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1ECoKYQ099088; Tue, 14 Feb 2012 12:50:20 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201202141250.q1ECoKYQ099088@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 14 Feb 2012 12:50:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231678 - in head: include/rpc sys/dev/mpt/mpilib sys/net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 12:50:21 -0000 Author: tijl Date: Tue Feb 14 12:50:20 2012 New Revision: 231678 URL: http://svn.freebsd.org/changeset/base/231678 Log: Change some headers such that lang/gcc* ports no longer patch them. The lang/gcc* ports patch headers where they think something is non-standard. These patched headers override the system headers which means you have to rebuild these ports whenever you do installworld to make sure they contain the latest changes. Modified: head/include/rpc/svc.h head/sys/dev/mpt/mpilib/mpi_type.h head/sys/net/zlib.h Modified: head/include/rpc/svc.h ============================================================================== --- head/include/rpc/svc.h Tue Feb 14 12:47:57 2012 (r231677) +++ head/include/rpc/svc.h Tue Feb 14 12:50:20 2012 (r231678) @@ -226,7 +226,7 @@ struct svc_req { * const SVCXPRT *xprt; * const rpcprog_t prog; * const rpcvers_t vers; - * const void (*dispatch)(); + * const void (*dispatch)(struct svc_req *, SVCXPRT *); * const struct netconfig *nconf; */ @@ -376,7 +376,7 @@ __BEGIN_DECLS extern int svc_create(void (*)(struct svc_req *, SVCXPRT *), const rpcprog_t, const rpcvers_t, const char *); /* - * void (*dispatch)(); -- dispatch routine + * void (*dispatch)(struct svc_req *, SVCXPRT *); * const rpcprog_t prognum; -- program number * const rpcvers_t versnum; -- version number * const char *nettype; -- network type @@ -392,7 +392,7 @@ extern SVCXPRT *svc_tp_create(void (*)(s const rpcprog_t, const rpcvers_t, const struct netconfig *); /* - * void (*dispatch)(); -- dispatch routine + * void (*dispatch)(struct svc_req *, SVCXPRT *); * const rpcprog_t prognum; -- program number * const rpcvers_t versnum; -- version number * const struct netconfig *nconf; -- netconfig structure Modified: head/sys/dev/mpt/mpilib/mpi_type.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_type.h Tue Feb 14 12:47:57 2012 (r231677) +++ head/sys/dev/mpt/mpilib/mpi_type.h Tue Feb 14 12:50:20 2012 (r231678) @@ -84,7 +84,7 @@ typedef uint32_t U32; #else -#if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc) +#if defined(__unix__) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc) typedef signed int S32; typedef unsigned int U32; Modified: head/sys/net/zlib.h ============================================================================== --- head/sys/net/zlib.h Tue Feb 14 12:47:57 2012 (r231677) +++ head/sys/net/zlib.h Tue Feb 14 12:50:20 2012 (r231678) @@ -109,7 +109,7 @@ extern "C" { #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) # define WIN32 #endif -#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386) +#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(__i386__) # ifndef __32BIT__ # define __32BIT__ # endif