diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-15 10:30:25 -0800 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-15 10:30:25 -0800 |
| commit | f4f8788f8c8aee1878e867201df437b47e79f743 (patch) | |
| tree | abecf262f7538028926c27f19b570db202d45110 | |
| parent | f1374c36d07abd3aaa15d6f512143189c1748099 (diff) | |
| parent | 202657b658877afbfae244447f983cd63b0c938c (diff) | |
| download | psutil-f4f8788f8c8aee1878e867201df437b47e79f743.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | CREDITS | 2 | ||||
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | psutil/arch/aix/net_kernel_structs.h | 5 |
3 files changed, 6 insertions, 3 deletions
@@ -57,7 +57,7 @@ W: http://www.jayloden.com N: Arnon Yaari (wiggin15) W: https://github.com/wiggin15 -I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214 +I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408 N: Jeff Tang W: https://github.com/mrjefftang diff --git a/HISTORY.rst b/HISTORY.rst index 73609c76..770182ed 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -16,6 +16,8 @@ XXXX-XX-XX - 1394_: [Windows] Process.exe() returns "[Error 0] The operation completed successfully" when Python process runs in "Virtual Secure Mode". - 1402_: psutil exceptions' repr() show the internal private module path. +- 1408_: [AIX] psutil won't compile on AIX 7.1 due to missing header. (patch + by Arnon Yaari) 5.5.0 ===== diff --git a/psutil/arch/aix/net_kernel_structs.h b/psutil/arch/aix/net_kernel_structs.h index 09f320ff..4e7a088c 100644 --- a/psutil/arch/aix/net_kernel_structs.h +++ b/psutil/arch/aix/net_kernel_structs.h @@ -18,6 +18,7 @@ #include <sys/protosw.h> #include <sys/unpcb.h> #include <sys/mbuf_base.h> +#include <sys/mbuf_macro.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> #include <netinet/tcpip.h> @@ -30,7 +31,7 @@ #define tcpcb64 tcpcb #define unpcb64 unpcb #define mbuf64 mbuf -#else +#else /* __64BIT__ */ struct file64 { int f_flag; int f_count; @@ -107,4 +108,4 @@ struct mbuf64 #define m_len m_hdr.mh_len -#endif
\ No newline at end of file +#endif /* __64BIT__ */
\ No newline at end of file |