diff options
| -rw-r--r-- | config.h.in | 6 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | man/httrack.1 | 2 | ||||
| -rw-r--r-- | src/htslib.c | 8 |
5 files changed, 53 insertions, 5 deletions
diff --git a/config.h.in b/config.h.in index 246c8e9..796e82f 100644 --- a/config.h.in +++ b/config.h.in @@ -108,3 +108,9 @@ /* Version number of package */ #undef VERSION + +/* in_port_t */ +#undef in_port_t + +/* sa_family_t */ +#undef sa_family_t @@ -15408,6 +15408,36 @@ $as_echo "$as_me: WARNING: *** in_addr_t not found" >&2;} fi +# check for in_port_ +ac_fn_c_check_type "$LINENO" "in_port_t" "ac_cv_type_in_port_t" " +#include <sys/types.h> +#include <netinet/in.h> + +" +if test "x$ac_cv_type_in_port_t" = xyes; then : + +else + +$as_echo "#define in_port_t uint16_t" >>confdefs.h + +fi + + +# check for sa_family_t +ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" " +#include <sys/types.h> +#include <netinet/in.h> + +" +if test "x$ac_cv_type_sa_family_t" = xyes; then : + +else + +$as_echo "#define sa_family_t uint16_t" >>confdefs.h + +fi + + ### zlib # # Handle user hints diff --git a/configure.ac b/configure.ac index dc77f3d..fd423c0 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,18 @@ AC_MSG_WARN([*** in_addr_t not found]), #include <netinet/in.h> #include <arpa/inet.h>]) +# check for in_port_ +AC_CHECK_TYPE(in_port_t, [], [AC_DEFINE([in_port_t], [uint16_t], [in_port_t])], [ +#include <sys/types.h> +#include <netinet/in.h> +]) + +# check for sa_family_t +AC_CHECK_TYPE(sa_family_t, [], [AC_DEFINE([sa_family_t], [uint16_t], [sa_family_t])], [ +#include <sys/types.h> +#include <netinet/in.h> +]) + ### zlib CHECK_ZLIB() diff --git a/man/httrack.1 b/man/httrack.1 index c66c8c0..296b2fa 100644 --- a/man/httrack.1 +++ b/man/httrack.1 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii httrack.1 .\" -.TH httrack 1 "14 May 2014" "httrack website copier" +.TH httrack 1 "15 May 2014" "httrack website copier" .SH NAME httrack \- offline browser : copy websites to a local directory .SH SYNOPSIS diff --git a/src/htslib.c b/src/htslib.c index f544141..fdd080e 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -86,10 +86,10 @@ static long int timezone = 0; /* Windows might be missing va_copy */ #ifdef _WIN32 -#ifndef va_copy
-#define va_copy(dst, src) ((dst) = (src))
-#endif
-#endif
+#ifndef va_copy +#define va_copy(dst, src) ((dst) = (src)) +#endif +#endif // Debugging #if _HTS_WIDE |