diff options
| author | Kevin McCarthy <kevin@8t8.us> | 2016-04-27 13:08:52 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2016-04-27 13:08:52 -0700 |
| commit | de228267466948e45cff1862684288398e9e9cc1 (patch) | |
| tree | 540e6850aefe11e42afee92300ec8c31819ab766 /mutt_tunnel.c | |
| parent | 80e314f205d513f28fdf5bc07cce07b8661bc551 (diff) | |
Create a wrapper sys_socket.h to work around Solaris namespace issues. (closes #3833)
Solaris includes "sys/stream.h" inside their "sys/socket.h". This
include file adds many non-reserved macros to Mutt's namespace, two of
which conflict with existing Mutt macros.
The simplest fix would be to rename those macros in Mutt, however this
will cause difficulty with out-of-tree patches. This fix creates a
wrapper include file that preserves those existing macros and prevents
the Solaris values from entering Mutt's namespace.
Diffstat (limited to 'mutt_tunnel.c')
| -rw-r--r-- | mutt_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mutt_tunnel.c b/mutt_tunnel.c index b43bbf93..49172160 100644 --- a/mutt_tunnel.c +++ b/mutt_tunnel.c @@ -27,7 +27,7 @@ #include <netinet/in.h> #include <sys/types.h> -#include <sys/socket.h> +#include "sys_socket.h" #include <sys/wait.h> #include <fcntl.h> #include <errno.h> |