diff options
| author | tijl <tijl@FreeBSD.org> | 2012-02-14 12:50:20 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2012-02-14 12:50:20 +0000 |
| commit | a89581c07f0ad3b2381b871ea3abe6875b4905a6 (patch) | |
| tree | 4daeb8f425a3d2413fa801077a2a0fd150abf867 | |
| parent | b529e734cb0e714064ede8ada785785cf36328b3 (diff) | |
| download | FreeBSD-src-a89581c07f0ad3b2381b871ea3abe6875b4905a6.zip FreeBSD-src-a89581c07f0ad3b2381b871ea3abe6875b4905a6.tar.gz | |
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.
| -rw-r--r-- | include/rpc/svc.h | 6 | ||||
| -rw-r--r-- | sys/dev/mpt/mpilib/mpi_type.h | 2 | ||||
| -rw-r--r-- | sys/net/zlib.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/rpc/svc.h b/include/rpc/svc.h index d73625e..4a3833c 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -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 (*)(struct svc_req *, SVCXPRT *), 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 diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h index 236baf6..6ff133c 100644 --- a/sys/dev/mpt/mpilib/mpi_type.h +++ b/sys/dev/mpt/mpilib/mpi_type.h @@ -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; diff --git a/sys/net/zlib.h b/sys/net/zlib.h index 85db8d4..44aa425 100644 --- a/sys/net/zlib.h +++ b/sys/net/zlib.h @@ -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 |
