ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix the netinet header checks for Mac OS and Solaris.

This commit is contained in:
Alexandre Julliard 2008-06-27 14:06:47 +02:00
parent da88293338
commit dfb308a6b1
4 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure vendored
View File

@ -7206,9 +7206,6 @@ done
@ -7261,13 +7258,10 @@ for ac_header in \
mntent.h \ mntent.h \
ncurses.h \ ncurses.h \
netdb.h \ netdb.h \
netinet/if_ether.h \
netinet/in.h \ netinet/in.h \
netinet/in_systm.h \ netinet/in_systm.h \
netinet/ip_icmp.h \
netinet/tcp.h \ netinet/tcp.h \
netinet/tcp_fsm.h \ netinet/tcp_fsm.h \
netinet/udp.h \
openssl/err.h \ openssl/err.h \
openssl/ssl.h \ openssl/ssl.h \
png.h \ png.h \
@ -7615,7 +7609,24 @@ done
for ac_header in netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h
for ac_header in \
netinet/ip.h \
net/if.h \
net/if_arp.h \
net/if_dl.h \
net/if_types.h \
net/route.h \
netinet/if_ether.h \
netinet/in_pcb.h \
netinet/ip_icmp.h \
netinet/ip_var.h \
netinet/udp.h \
netipx/ipx.h \
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5 { echo "$as_me:$LINENO: checking for $ac_header" >&5
@ -7639,6 +7650,9 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>
#endif #endif
#ifdef HAVE_NETINET_IP_H
# include <netinet/ip.h>
#endif
#include <$ac_header> #include <$ac_header>
_ACEOF _ACEOF
@ -7713,6 +7727,9 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>
#endif #endif
#ifdef HAVE_NETINET_IP_H
# include <netinet/ip.h>
#endif
#ifdef HAVE_NETINET_IP_VAR_H #ifdef HAVE_NETINET_IP_VAR_H
# include <netinet/ip_var.h> # include <netinet/ip_var.h>
#endif #endif

25
configure.ac
View File

@ -274,13 +274,10 @@ AC_CHECK_HEADERS(\
mntent.h \ mntent.h \
ncurses.h \ ncurses.h \
netdb.h \ netdb.h \
netinet/if_ether.h \
netinet/in.h \ netinet/in.h \
netinet/in_systm.h \ netinet/in_systm.h \
netinet/ip_icmp.h \
netinet/tcp.h \ netinet/tcp.h \
netinet/tcp_fsm.h \ netinet/tcp_fsm.h \
netinet/udp.h \
openssl/err.h \ openssl/err.h \
openssl/ssl.h \ openssl/ssl.h \
png.h \ png.h \
@ -352,8 +349,20 @@ AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,,
# include <sys/param.h> # include <sys/param.h>
#endif]) #endif])
AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h],,, AC_CHECK_HEADERS(\
[#include <sys/types.h> netinet/ip.h \
net/if.h \
net/if_arp.h \
net/if_dl.h \
net/if_types.h \
net/route.h \
netinet/if_ether.h \
netinet/in_pcb.h \
netinet/ip_icmp.h \
netinet/ip_var.h \
netinet/udp.h \
netipx/ipx.h \
,,,[#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
@ -362,6 +371,9 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_IP_H
# include <netinet/ip.h>
#endif]) #endif])
AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,, AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,,
@ -378,6 +390,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>
#endif #endif
#ifdef HAVE_NETINET_IP_H
# include <netinet/ip.h>
#endif
#ifdef HAVE_NETINET_IP_VAR_H #ifdef HAVE_NETINET_IP_VAR_H
# include <netinet/ip_var.h> # include <netinet/ip_var.h>
#endif #endif

8
dlls/iphlpapi/ipstats.c
View File

@ -61,13 +61,15 @@
#ifdef HAVE_NETINET_IF_ETHER_H #ifdef HAVE_NETINET_IF_ETHER_H
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
#endif #endif
#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
#ifdef HAVE_NETINET_TCP_H #ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h> #include <netinet/tcp.h>
#endif #endif
#ifdef HAVE_NETINET_TCP_FSM_H #ifdef HAVE_NETINET_TCP_FSM_H
#include <netinet/tcp_fsm.h> #include <netinet/tcp_fsm.h>
#endif #endif
#ifdef HAVE_NETINET_IN_PCB_H #ifdef HAVE_NETINET_IN_PCB_H
#include <netinet/in_pcb.h> #include <netinet/in_pcb.h>
#endif #endif
@ -628,6 +630,10 @@ DWORD getIPStats(PMIB_IPSTATS stats)
DWORD getTCPStats(MIB_TCPSTATS *stats) DWORD getTCPStats(MIB_TCPSTATS *stats)
{ {
#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) #if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS)
#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */
#define TCPTV_MIN 2
#define TCPTV_REXMTMAX 128
#endif
int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS};
#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
#define hz 1000 #define hz 1000

3
include/config.h.in
View File

@ -453,6 +453,9 @@
/* Define to 1 if you have the <netinet/in_systm.h> header file. */ /* Define to 1 if you have the <netinet/in_systm.h> header file. */
#undef HAVE_NETINET_IN_SYSTM_H #undef HAVE_NETINET_IN_SYSTM_H
/* Define to 1 if you have the <netinet/ip.h> header file. */
#undef HAVE_NETINET_IP_H
/* Define to 1 if you have the <netinet/ip_icmp.h> header file. */ /* Define to 1 if you have the <netinet/ip_icmp.h> header file. */
#undef HAVE_NETINET_IP_ICMP_H #undef HAVE_NETINET_IP_ICMP_H