diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
| commit | 812767d2bb4e201b4f826fd31924d2cafb8fe0ae (patch) | |
| tree | 3e3dbc65eb273c201d08a9eaf227f857e2a62358 /include | |
| parent | c1d136c87f2377fd07592928003e67490eb479a6 (diff) | |
| parent | b0e9d555db88639874b99e5151bf5981a8223322 (diff) | |
| download | FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.zip FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/rpc/rpcent.h | 2 | ||||
| -rw-r--r-- | include/stddef.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h index 405ba67..c1650fa 100644 --- a/include/rpc/rpcent.h +++ b/include/rpc/rpcent.h @@ -56,7 +56,7 @@ __BEGIN_DECLS * These interfaces are currently implemented through nsswitch and are * MT-safe. */ -extern struct rpcent *getrpcbyname(char *); +extern struct rpcent *getrpcbyname(const char *); extern struct rpcent *getrpcbynumber(int); extern struct rpcent *getrpcent(void); extern void setrpcent(int); diff --git a/include/stddef.h b/include/stddef.h index 2c73a2e..99629e0 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -59,6 +59,14 @@ typedef ___wchar_t wchar_t; #endif #endif +#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L +#ifndef __CLANG_MAX_ALIGN_T_DEFINED +typedef __max_align_t max_align_t; +#define __CLANG_MAX_ALIGN_T_DEFINED +#define __GCC_MAX_ALIGN_T +#endif +#endif + #define offsetof(type, member) __offsetof(type, member) #endif /* _STDDEF_H_ */ |
