diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2022-10-21 01:40:39 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2022-10-21 01:40:39 +0200 |
| commit | 11c89d9dc05dc04862c7fa11c90996efe4758913 (patch) | |
| tree | fd88ff00342178cbf3b13542bf45f6814d5ee741 | |
| parent | 57a7a7047e22f79cabb984e883a70888eb370558 (diff) | |
| parent | b0f780a1f46775e7d18a5176c839dac1a0977191 (diff) | |
| download | psutil-11c89d9dc05dc04862c7fa11c90996efe4758913.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | psutil/_psutil_posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 07c10398..24628afc 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -708,13 +708,14 @@ int psutil_get_nic_speed(int ifm_active) { case(IFM_1000_LX): // 1000baseLX - single-mode fiber case(IFM_1000_CX): // 1000baseCX - 150ohm STP #if defined(IFM_1000_TX) && !defined(PSUTIL_OPENBSD) + #define HAS_CASE_IFM_1000_TX 1 // 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 case(IFM_1000_FX): #endif -#ifdef IFM_1000_T +#if defined(IFM_1000_T) && (!HAS_CASE_IFM_1000_TX || IFM_1000_T != IFM_1000_TX) case(IFM_1000_T): #endif return 1000; |