+1 -1

Makefile.am

reviewed

··· 72 72 README.SSL smime.h group.h \ 73 73 muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ 74 74 ChangeLog mkchangelog.sh mutt_idna.h \ 75 75 - snprintf.c regex.c crypt-gpgme.h hcachever.sh.in sys_socket.h \ 75 75 + snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \ 76 76 txt2c.c txt2c.sh version.sh check_sec.sh 77 77 78 78 EXTRA_SCRIPTS = smime_keys

+1 -1

getdomain.c

reviewed

··· 24 24 #include <unistd.h> 25 25 #include <netdb.h> 26 26 #include <sys/types.h> 27 27 - #include "sys_socket.h" 27 27 + #include <sys/socket.h> 28 28 29 29 #include "mutt.h" 30 30

+1 -1

mutt_sasl.c

reviewed

··· 30 30 #include <errno.h> 31 31 #include <netdb.h> 32 32 #include <sasl/sasl.h> 33 33 - #include "sys_socket.h" 33 33 + #include <sys/socket.h> 34 34 #include <netinet/in.h> 35 35 36 36 static int getnameinfo_err(int ret)

+1 -1

mutt_socket.c

reviewed

··· 40 40 #ifdef HAVE_SYS_TIME_H 41 41 #include <sys/time.h> 42 42 #endif 43 43 - #include "sys_socket.h" 43 43 + #include <sys/socket.h> 44 44 #ifdef HAVE_SYS_SELECT_H 45 45 #include <sys/select.h> 46 46 #endif

+1 -1

mutt_tunnel.c

reviewed

··· 27 27 28 28 #include <netinet/in.h> 29 29 #include <sys/types.h> 30 30 - #include "sys_socket.h" 30 30 + #include <sys/socket.h> 31 31 #include <sys/wait.h> 32 32 #include <fcntl.h> 33 33 #include <errno.h>

-51

sys_socket.h

reviewed

··· 1 1 - /* 2 2 - * Copyright (C) 2016 Kevin J. McCarthy <kevin@8t8.us> 3 3 - * 4 4 - * This program is free software; you can redistribute it and/or modify 5 5 - * it under the terms of the GNU General Public License as published by 6 6 - * the Free Software Foundation; either version 2 of the License, or 7 7 - * (at your option) any later version. 8 8 - * 9 9 - * This program is distributed in the hope that it will be useful, 10 10 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 11 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 12 - * GNU General Public License for more details. 13 13 - * 14 14 - * You should have received a copy of the GNU General Public License 15 15 - * along with this program; if not, write to the Free Software 16 16 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 17 17 - */ 18 18 - 19 19 - /* Solaris, OpenIndiana, and probably other derivatives 20 20 - * are including sys/stream.h inside their sys/socket.h. 21 21 - * 22 22 - * This include file is defining macros M_CMD and M_READ which 23 23 - * are conflicting with the same macros Mutt defines in mutt.h 24 24 - * 25 25 - * To minimize breakage with out-of-tree patches, this is a workaround. 26 26 - */ 27 27 - 28 28 - #ifdef M_CMD 29 29 - # define MUTT_ORIG_CMD M_CMD 30 30 - # undef M_CMD 31 31 - #endif 32 32 - 33 33 - #ifdef M_READ 34 34 - # define MUTT_ORIG_READ M_READ 35 35 - # undef M_READ 36 36 - #endif 37 37 - 38 38 - #include <sys/socket.h> 39 39 - 40 40 - #undef M_CMD 41 41 - #undef M_READ 42 42 - 43 43 - #ifdef MUTT_ORIG_CMD 44 44 - # define M_CMD MUTT_ORIG_CMD 45 45 - # undef MUTT_ORIG_CMD 46 46 - #endif 47 47 - 48 48 - #ifdef MUTT_ORIG_READ 49 49 - # define M_READ MUTT_ORIG_READ 50 50 - # undef MUTT_ORIG_READ 51 51 - #endif