1*4882a593SmuzhiyunUpstream-Status: Submitted [https://github.com/probonopd/zsync-curl/pull/41] 2*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@arm.com> 3*4882a593Smuzhiyun 4*4882a593Smuzhiyundiff --git a/src/configure.ac b/src/configure.ac 5*4882a593Smuzhiyunindex 10de8c4..6488140 100644 6*4882a593Smuzhiyun--- a/src/configure.ac 7*4882a593Smuzhiyun+++ b/src/configure.ac 8*4882a593Smuzhiyun@@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([autotools]) 9*4882a593Smuzhiyun AC_CANONICAL_HOST 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign check-news -Woverride -Wobsolete -Wportability -Wsyntax -Wunsupported]) 12*4882a593Smuzhiyun-AM_MAINTAINER_MODE 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun dnl --- Check for programs 15*4882a593Smuzhiyun AC_PROG_CC 16*4882a593Smuzhiyun@@ -23,6 +22,7 @@ AS_IF([test "x$enable_profile" = "xyes"], [ 17*4882a593Smuzhiyun ZS_CFLAGS="${ZS_CFLAGS} -pg" ]) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun dnl --- Header files, typedefs, structures, libraries 20*4882a593Smuzhiyun+AC_USE_SYSTEM_EXTENSIONS 21*4882a593Smuzhiyun AC_C_CONST 22*4882a593Smuzhiyun AC_HEADER_STDC 23*4882a593Smuzhiyun # string.h, memory.h, stdlib.h both included in the default header checks 24*4882a593Smuzhiyun@@ -55,10 +55,6 @@ case $host_os in 25*4882a593Smuzhiyun host_os_mingw32=yes 26*4882a593Smuzhiyun LIBS="${LIBS} -lwsock32" 27*4882a593Smuzhiyun ;; 28*4882a593Smuzhiyun- *) 29*4882a593Smuzhiyun- AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present]) 30*4882a593Smuzhiyun- AC_DEFINE([_BSD_SOURCE],1, [Enable BSD extensions if present]) 31*4882a593Smuzhiyun- ;; 32*4882a593Smuzhiyun esac 33*4882a593Smuzhiyun AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes") 34*4882a593Smuzhiyun 35*4882a593Smuzhiyundiff --git a/src/librcksum/Makefile.am b/src/librcksum/Makefile.am 36*4882a593Smuzhiyunindex f4fce72..47754eb 100644 37*4882a593Smuzhiyun--- a/src/librcksum/Makefile.am 38*4882a593Smuzhiyun+++ b/src/librcksum/Makefile.am 39*4882a593Smuzhiyun@@ -1,4 +1,4 @@ 40*4882a593Smuzhiyun- 41*4882a593Smuzhiyun+AM_CPPFLAGS = "-I$(top_srcdir)" 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun noinst_LIBRARIES = librcksum.a 44*4882a593Smuzhiyun 45*4882a593Smuzhiyundiff --git a/src/librcksum/md4.h b/src/librcksum/md4.h 46*4882a593Smuzhiyunindex e90603a..0ed7485 100644 47*4882a593Smuzhiyun--- a/src/librcksum/md4.h 48*4882a593Smuzhiyun+++ b/src/librcksum/md4.h 49*4882a593Smuzhiyun@@ -18,11 +18,8 @@ 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun #include "zsglobal.h" 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun-#ifdef HAVE_INTTYPES_H 54*4882a593Smuzhiyun-#include <inttypes.h> 55*4882a593Smuzhiyun-#else 56*4882a593Smuzhiyun+#include <stdint.h> 57*4882a593Smuzhiyun #include <sys/types.h> 58*4882a593Smuzhiyun-#endif 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun #define MD4_BLOCK_LENGTH 64 61*4882a593Smuzhiyun #define MD4_DIGEST_LENGTH 16 62*4882a593Smuzhiyundiff --git a/src/libzsync/Makefile.am b/src/libzsync/Makefile.am 63*4882a593Smuzhiyunindex 0a6ae85..33a5951 100644 64*4882a593Smuzhiyun--- a/src/libzsync/Makefile.am 65*4882a593Smuzhiyun+++ b/src/libzsync/Makefile.am 66*4882a593Smuzhiyun@@ -1,3 +1,4 @@ 67*4882a593Smuzhiyun+AM_CPPFLAGS = "-I$(top_srcdir)" 68*4882a593Smuzhiyun 69*4882a593Smuzhiyun noinst_LIBRARIES = libzsync.a 70*4882a593Smuzhiyun 71*4882a593Smuzhiyundiff --git a/src/libzsync/sha1.h b/src/libzsync/sha1.h 72*4882a593Smuzhiyunindex 3946505..87f3794 100644 73*4882a593Smuzhiyun--- a/src/libzsync/sha1.h 74*4882a593Smuzhiyun+++ b/src/libzsync/sha1.h 75*4882a593Smuzhiyun@@ -11,11 +11,8 @@ 76*4882a593Smuzhiyun 77*4882a593Smuzhiyun #include "config.h" 78*4882a593Smuzhiyun 79*4882a593Smuzhiyun-#ifdef HAVE_INTTYPES_H 80*4882a593Smuzhiyun-#include <inttypes.h> 81*4882a593Smuzhiyun-#else 82*4882a593Smuzhiyun+#include <stdint.h> 83*4882a593Smuzhiyun #include <sys/types.h> 84*4882a593Smuzhiyun-#endif 85*4882a593Smuzhiyun 86*4882a593Smuzhiyun #define SHA1_BLOCK_LENGTH 64 87*4882a593Smuzhiyun #define SHA1_DIGEST_LENGTH 20 88*4882a593Smuzhiyundiff --git a/src/libzsync/zmap.c b/src/libzsync/zmap.c 89*4882a593Smuzhiyunindex f052dba..030b2a5 100644 90*4882a593Smuzhiyun--- a/src/libzsync/zmap.c 91*4882a593Smuzhiyun+++ b/src/libzsync/zmap.c 92*4882a593Smuzhiyun@@ -28,9 +28,6 @@ 93*4882a593Smuzhiyun #include <string.h> 94*4882a593Smuzhiyun #include <sys/types.h> 95*4882a593Smuzhiyun #include <arpa/inet.h> 96*4882a593Smuzhiyun-#ifdef HAVE_INTTYPES_H 97*4882a593Smuzhiyun-#include <inttypes.h> 98*4882a593Smuzhiyun-#endif 99*4882a593Smuzhiyun 100*4882a593Smuzhiyun #ifdef WITH_DMALLOC 101*4882a593Smuzhiyun # include <dmalloc.h> 102*4882a593Smuzhiyundiff --git a/src/make.c b/src/make.c 103*4882a593Smuzhiyunindex 191b527..ba7f3a9 100644 104*4882a593Smuzhiyun--- a/src/make.c 105*4882a593Smuzhiyun+++ b/src/make.c 106*4882a593Smuzhiyun@@ -28,9 +28,6 @@ 107*4882a593Smuzhiyun #include <time.h> 108*4882a593Smuzhiyun 109*4882a593Smuzhiyun #include <arpa/inet.h> 110*4882a593Smuzhiyun-#ifdef HAVE_INTTYPES_H 111*4882a593Smuzhiyun-#include <inttypes.h> 112*4882a593Smuzhiyun-#endif 113*4882a593Smuzhiyun 114*4882a593Smuzhiyun #include <sys/types.h> 115*4882a593Smuzhiyun #include <sys/stat.h> 116