diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-09-06 20:13:24 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-09-06 20:13:24 +0200 |
| commit | 1da9d09f9816af94258652a905a0239dfb89a043 (patch) | |
| tree | ca8a93c25c7a7dffa7c3ac1d8cd7754b60e637d9 /psutil/_psutil_posix.c | |
| parent | af403501e1cad8d89e8dec98ed87c118b7c31620 (diff) | |
| parent | 7edb5590c44f1d6ce7d461bf5e17d168645d6e7b (diff) | |
| download | psutil-1da9d09f9816af94258652a905a0239dfb89a043.tar.gz | |
merge with latest code
Diffstat (limited to 'psutil/_psutil_posix.c')
| -rw-r--r-- | psutil/_psutil_posix.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 1e27cdb0..07404206 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -26,7 +26,7 @@ #include <linux/if_packet.h> #endif // end linux -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #include <netdb.h> #include <netinet/in.h> #include <net/if_dl.h> @@ -120,7 +120,7 @@ psutil_convert_ipaddr(struct sockaddr *addr, int family) { data = (const char *)lladdr->sll_addr; } #endif -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) else if (addr->sa_family == AF_LINK) { // Note: prior to Python 3.4 socket module does not expose // AF_LINK so we'll do. @@ -250,7 +250,7 @@ error: * net_if_stats() implementation. This is here because it is common * to both OSX and FreeBSD and I didn't know where else to put it. */ -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #include <sys/sockio.h> #include <net/if_media.h> @@ -287,8 +287,8 @@ int psutil_get_nic_speed(int ifm_active) { case(IFM_1000_SX): // 1000BaseSX - multi-mode fiber case(IFM_1000_LX): // 1000baseLX - single-mode fiber case(IFM_1000_CX): // 1000baseCX - 150ohm STP -#if defined(IFM_1000_TX) && !defined(OPENBSD) - // FreeBSD 4 and others (but NOT OpenBSD)? +#if defined(IFM_1000_TX) && !defined(__OpenBSD__) + // FreeBSD 4 and others (but NOT OpenBSD) -> #define IFM_1000_T in net/if_media.h case(IFM_1000_TX): #endif #ifdef IFM_1000_FX @@ -478,7 +478,7 @@ PsutilMethods[] = { "Set process priority"}, {"net_if_addrs", psutil_net_if_addrs, METH_VARARGS, "Retrieve NICs information"}, -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) {"net_if_stats", psutil_net_if_stats, METH_VARARGS, "Return NIC stats."}, #endif @@ -537,7 +537,7 @@ void init_psutil_posix(void) PyObject *module = Py_InitModule("_psutil_posix", PsutilMethods); #endif -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__sun) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__sun) PyModule_AddIntConstant(module, "AF_LINK", AF_LINK); #endif |