提交 3ed8c9f2 编写于 作者: R Rich Felker

fix all missing instances of __cplusplus checks/extern "C" in headers

patch by Arvid Picciani (aep)
上级 26120950
#ifndef _ALLOCA_H #ifndef _ALLOCA_H
#define _ALLOCA_H #define _ALLOCA_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_size_t #define __NEED_size_t
#include <bits/alltypes.h> #include <bits/alltypes.h>
void *alloca(size_t); void *alloca(size_t);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _ARPA_INET_H #ifndef _ARPA_INET_H
#define _ARPA_INET_H #define _ARPA_INET_H
#ifdef __cplusplus
extern "C" {
#endif
#include <netinet/in.h> #include <netinet/in.h>
#include <inttypes.h> #include <inttypes.h>
...@@ -30,4 +34,8 @@ int inet_aton (const char *, struct in_addr *); /* nonstandard but widely used * ...@@ -30,4 +34,8 @@ int inet_aton (const char *, struct in_addr *); /* nonstandard but widely used *
#define INET_ADDRSTRLEN 16 #define INET_ADDRSTRLEN 16
#define INET6_ADDRSTRLEN 46 #define INET6_ADDRSTRLEN 46
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _CTYPE_H #ifndef _CTYPE_H
#define _CTYPE_H #define _CTYPE_H
#ifdef __cplusplus
extern "C" {
#endif
int isalnum(int); int isalnum(int);
int isalpha(int); int isalpha(int);
int isblank(int); int isblank(int);
...@@ -53,4 +57,8 @@ int toascii(int); ...@@ -53,4 +57,8 @@ int toascii(int);
#endif #endif
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _FTW_H #ifndef _FTW_H
#define _FTW_H #define _FTW_H
#ifdef __cplusplus
extern "C" {
#endif
/* Normally we do not nest header includes. However useless bloat /* Normally we do not nest header includes. However useless bloat
* like ftw may be treated as a special case. Otherwise we would * like ftw may be treated as a special case. Otherwise we would
* have to deal with duplicating all the stat.h mess. */ * have to deal with duplicating all the stat.h mess. */
...@@ -28,4 +32,8 @@ struct FTW ...@@ -28,4 +32,8 @@ struct FTW
int ftw(const char *, int (*)(const char *, const struct stat *, int), int); int ftw(const char *, int (*)(const char *, const struct stat *, int), int);
int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int); int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _MATH_H #ifndef _MATH_H
#define _MATH_H #define _MATH_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED___uint16_t #define __NEED___uint16_t
#define __NEED___uint32_t #define __NEED___uint32_t
#define __NEED___uint64_t #define __NEED___uint64_t
...@@ -317,4 +321,8 @@ extern int signgam; ...@@ -317,4 +321,8 @@ extern int signgam;
double scalb(double, double); double scalb(double, double);
#endif #endif
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef __NET_ETHERNET_H #ifndef __NET_ETHERNET_H
#define __NET_ETHERNET_H 1 #define __NET_ETHERNET_H 1
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
...@@ -44,4 +48,8 @@ struct ether_header { ...@@ -44,4 +48,8 @@ struct ether_header {
#define ETHERMTU ETH_DATA_LEN #define ETHERMTU ETH_DATA_LEN
#define ETHERMIN (ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) #define ETHERMIN (ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN)
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _NET_IF_H #ifndef _NET_IF_H
#define _NET_IF_H #define _NET_IF_H
#ifdef __cplusplus
extern "C" {
#endif
#define IF_NAMESIZE 16 #define IF_NAMESIZE 16
struct if_nameindex struct if_nameindex
...@@ -117,6 +121,8 @@ struct ifconf { ...@@ -117,6 +121,8 @@ struct ifconf {
#endif #endif
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _NET_ROUTE_H #ifndef _NET_ROUTE_H
#define _NET_ROUTE_H #define _NET_ROUTE_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h> #include <stdint.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -113,4 +117,8 @@ struct in6_rtmsg { ...@@ -113,4 +117,8 @@ struct in6_rtmsg {
#define RTMSG_AR_FAILED 0x51 #define RTMSG_AR_FAILED 0x51
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _NETINET_IN_H #ifndef _NETINET_IN_H
#define _NETINET_IN_H #define _NETINET_IN_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_in_addr_t #define __NEED_in_addr_t
#define __NEED_in_port_t #define __NEED_in_port_t
#define __NEED_sa_family_t #define __NEED_sa_family_t
...@@ -300,4 +304,8 @@ struct ip6_mtuinfo ...@@ -300,4 +304,8 @@ struct ip6_mtuinfo
#define IPV6_RTHDR_TYPE_0 0 #define IPV6_RTHDR_TYPE_0 0
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_MOUNT_H #ifndef _SYS_MOUNT_H
#define _SYS_MOUNT_H #define _SYS_MOUNT_H
#ifdef __cplusplus
extern "C" {
#endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#define BLKROSET _IO(0x12, 93) #define BLKROSET _IO(0x12, 93)
...@@ -43,4 +47,8 @@ int mount(const char *, const char *, const char *, unsigned long, const void *) ...@@ -43,4 +47,8 @@ int mount(const char *, const char *, const char *, unsigned long, const void *)
int umount(const char *); int umount(const char *);
int umount2(const char *, int); int umount2(const char *, int);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_MSG_H #ifndef _SYS_MSG_H
#define _SYS_MSG_H #define _SYS_MSG_H
#ifdef __cplusplus
extern "C" {
#endif
#include <sys/ipc.h> #include <sys/ipc.h>
#define __NEED_pid_t #define __NEED_pid_t
...@@ -33,4 +37,8 @@ int msgget (key_t, int); ...@@ -33,4 +37,8 @@ int msgget (key_t, int);
ssize_t msgrcv (int, void *, size_t, long, int); ssize_t msgrcv (int, void *, size_t, long, int);
int msgsnd (int, const void *, size_t, int); int msgsnd (int, const void *, size_t, int);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_RESOURCE_H #ifndef _SYS_RESOURCE_H
#define _SYS_RESOURCE_H #define _SYS_RESOURCE_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_id_t #define __NEED_id_t
#define __NEED_time_t #define __NEED_time_t
#define __NEED_struct_timeval #define __NEED_struct_timeval
...@@ -76,4 +80,8 @@ int setpriority (int, id_t, int); ...@@ -76,4 +80,8 @@ int setpriority (int, id_t, int);
#define RLIM_NLIMITS RLIMIT_NLIMITS #define RLIM_NLIMITS RLIMIT_NLIMITS
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_SHM_H #ifndef _SYS_SHM_H
#define _SYS_SHM_H #define _SYS_SHM_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_time_t #define __NEED_time_t
#define __NEED_size_t #define __NEED_size_t
#define __NEED_pid_t #define __NEED_pid_t
...@@ -43,4 +47,8 @@ int shmctl(int, int, struct shmid_ds *); ...@@ -43,4 +47,8 @@ int shmctl(int, int, struct shmid_ds *);
int shmdt(const void *); int shmdt(const void *);
int shmget(key_t, size_t, int); int shmget(key_t, size_t, int);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_STATFS_H #ifndef _SYS_STATFS_H
#define _SYS_STATFS_H #define _SYS_STATFS_H
#ifdef __cplusplus
extern "C" {
#endif
#include <sys/statvfs.h> #include <sys/statvfs.h>
typedef struct { typedef struct {
...@@ -12,4 +16,8 @@ typedef struct { ...@@ -12,4 +16,8 @@ typedef struct {
int statfs (const char *, struct statfs *); int statfs (const char *, struct statfs *);
int fstatfs (int, struct statfs *); int fstatfs (int, struct statfs *);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_STATVFS_H #ifndef _SYS_STATVFS_H
#define _SYS_STATVFS_H #define _SYS_STATVFS_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_fsblkcnt_t #define __NEED_fsblkcnt_t
#define __NEED_fsfilcnt_t #define __NEED_fsfilcnt_t
...@@ -38,5 +41,8 @@ int fstatvfs (int, struct statvfs *); ...@@ -38,5 +41,8 @@ int fstatvfs (int, struct statvfs *);
#define ST_NOATIME 1024 #define ST_NOATIME 1024
#define ST_NODIRATIME 2048 #define ST_NODIRATIME 2048
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_SWAP_H #ifndef _SYS_SWAP_H
#define _SYS_SWAP_H #define _SYS_SWAP_H
#ifdef __cplusplus
extern "C" {
#endif
#define SWAP_FLAG_PREFER 0x8000 #define SWAP_FLAG_PREFER 0x8000
#define SWAP_FLAG_PRIO_MASK 0x7fff #define SWAP_FLAG_PRIO_MASK 0x7fff
#define SWAP_FLAG_PRIO_SHIFT 0 #define SWAP_FLAG_PRIO_SHIFT 0
...@@ -8,4 +13,8 @@ ...@@ -8,4 +13,8 @@
int swapon (const char *, int); int swapon (const char *, int);
int swapoff (const char *); int swapoff (const char *);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_SYSCTL_H #ifndef _SYS_SYSCTL_H
#define _SYS_SYSCTL_H #define _SYS_SYSCTL_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_size_t #define __NEED_size_t
#include <bits/alltypes.h> #include <bits/alltypes.h>
int sysctl (int *, int, void *, size_t *, void *, size_t); int sysctl (int *, int, void *, size_t *, void *, size_t);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_SYSINFO_H #ifndef _SYS_SYSINFO_H
#define _SYS_SYSINFO_H #define _SYS_SYSINFO_H
#ifdef __cplusplus
extern "C" {
#endif
/* ?? */ /* ?? */
#define SI_LOAD_SHIFT 16 #define SI_LOAD_SHIFT 16
...@@ -26,4 +30,8 @@ int get_nprocs (void); ...@@ -26,4 +30,8 @@ int get_nprocs (void);
long long get_phys_pages (void); long long get_phys_pages (void);
long long get_avphys_pages (void); long long get_avphys_pages (void);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_TIMES_H #ifndef _SYS_TIMES_H
#define _SYS_TIMES_H #define _SYS_TIMES_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_clock_t #define __NEED_clock_t
#include <bits/alltypes.h> #include <bits/alltypes.h>
...@@ -14,4 +18,9 @@ struct tms ...@@ -14,4 +18,9 @@ struct tms
clock_t times (struct tms *); clock_t times (struct tms *);
#ifdef __cplusplus
}
#endif #endif
#endif
#ifndef _SYS_UIO_H #ifndef _SYS_UIO_H
#define _SYS_UIO_H #define _SYS_UIO_H
#ifdef __cplusplus
extern "C" {
#endif
#define __NEED_size_t #define __NEED_size_t
#define __NEED_ssize_t #define __NEED_ssize_t
#define __NEED_struct_iovec #define __NEED_struct_iovec
...@@ -10,4 +14,8 @@ ...@@ -10,4 +14,8 @@
ssize_t readv (int, const struct iovec *, int); ssize_t readv (int, const struct iovec *, int);
ssize_t writev (int, const struct iovec *, int); ssize_t writev (int, const struct iovec *, int);
#ifdef __cplusplus
}
#endif
#endif #endif
#ifndef _SYS_UTSNAME_H #ifndef _SYS_UTSNAME_H
#define _SYS_UTSNAME_H #define _SYS_UTSNAME_H
#ifdef __cplusplus
extern "C" {
#endif
struct utsname struct utsname
{ {
char sysname[65]; char sysname[65];
...@@ -17,5 +21,8 @@ struct utsname ...@@ -17,5 +21,8 @@ struct utsname
int uname (struct utsname *); int uname (struct utsname *);
#ifdef __cplusplus
}
#endif
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册