diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-02-10 12:57:42 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-02-10 12:57:42 +0100 |
| commit | dde0f1ca878e1cd7dcac70e501ba2b5570eb2dcc (patch) | |
| tree | 37408bfb5881fdc34d306b2acdad76b5d292bc24 | |
| parent | 0edbd92fc3392339873b389507d1ca52316e9d32 (diff) | |
| parent | 9e5051c4d550834260aa9d1a9e407f34131d9cbd (diff) | |
| download | psutil-922-if-flags.tar.gz | |
Merge branch 'master' into 922-if-flags922-if-flags
| -rw-r--r-- | psutil/_psutil_posix.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 2013b673..a96b356d 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -28,6 +28,9 @@ #include <netdb.h> #include <netinet/in.h> #include <net/if_dl.h> + #include <sys/sockio.h> + #include <net/if_media.h> + #include <net/if.h> #elif defined(PSUTIL_SUNOS) #include <netdb.h> #include <sys/sockio.h> @@ -340,10 +343,6 @@ error: */ #if defined(PSUTIL_BSD) || defined(PSUTIL_OSX) -#include <sys/sockio.h> -#include <net/if_media.h> -#include <net/if.h> - int psutil_get_nic_speed(int ifm_active) { // Determine NIC speed. Taken from: // http://www.i-scream.org/libstatgrab/ |