1. clamav-devel
  2. Commit cc071bf147d00cfca2e2c9f9e80d09e56ade382b
Browse code

Fix Windows compilation

Shawn Webb authored on 2014/11/07 01:51:21
Showing 26 changed files
Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ... 
@@ -955,10 +955,9 @@ distcheck: dist
955 955 
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
956 956 
 	  && am__cwd=`pwd` \
957 957 
 	  && $(am__cd) $(distdir)/_build \
958 
-	  && ../configure \
958 
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
959 959 
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
960 960 
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
961 
-	    --srcdir=.. --prefix="$$dc_install_base" \
962 961 
 	  && $(MAKE) $(AM_MAKEFLAGS) \
963 962 
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
964 963 
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
aclocal.m4
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1 
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
2 2
3 3 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
... ... 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
35 35 
 [am__api_version='1.14'
36 36 
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 37 
 dnl require some minimum version.  Point them to the right macro.
38 
-m4_if([$1], [1.14.1], [],
38 
+m4_if([$1], [1.14], [],
39 39 
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 40 
 ])
41 41
... ... 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
51 51 
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52 52 
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53 53 
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54 
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
54 
+[AM_AUTOMAKE_VERSION([1.14])dnl
55 55 
 m4_ifndef([AC_AUTOCONF_VERSION],
56 56 
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57 57 
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
clamav-config.h.in
History View file @ cc071bf
... ... 
@@ -191,6 +191,9 @@
191 191 
 /* have getaddrinfo() */
192 192 
 #undef HAVE_GETADDRINFO
193 193
194 
+/* Define to 1 if you have the `getnameinfo' function. */
195 
+#undef HAVE_GETNAMEINFO
196 
+
194 197 
 /* Define to 1 if getpagesize() is available */
195 198 
 #undef HAVE_GETPAGESIZE
196 199
clamav-milter/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clambc/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamconf/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamd/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamd/tcpserver.c
History View file @ cc071bf
... ... 
@@ -104,12 +104,18 @@ int tcpserver(int **lsockets, unsigned int *nlsockets, char *ipaddr, const struc
104 104 
         }
105 105 
 #endif /* IPV6_V6ONLY */
106 106
107 
+#ifdef HAVE_GETNAMEINFO
107 108 
         if ((res = getnameinfo(p->ai_addr, p->ai_addrlen, host, sizeof(host),
108 109 
                                serv, sizeof(serv), NI_NUMERICHOST|NI_NUMERICSERV))) {
109 110 
             logg("!TCP: getnameinfo failed: %s\n", gai_strerror(res));
110 111 
             host[0] = '\0';
111 112 
             serv[0] = '\0';
112 113 
         }
114 
+#else
115 
+        strncpy(host, ipaddr, sizeof(host));
116 
+        host[sizeof(host)-1] = '\0';
117 
+        snprintf(serv, sizeof(serv), "%u", (unsigned int)(optget(opts, "TCPSocket")->numarg));
118 
+#endif
113 119 
         if(bind(sockfd, p->ai_addr, p->ai_addrlen) == -1) {
114 120 
             estr = strerror(errno);
115 121 
             logg("!TCP: Cannot bind to [%s]:%s: %s\n", host, serv, estr);
clamdscan/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamdtop/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamscan/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
clamsubmit/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
configure
History View file @ cc071bf
... ... 
@@ -15702,7 +15702,7 @@ if test "$ac_res" != no; then :
15702 15702 
 fi
15703 15703
15704 15704
15705 
-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise
15705 
+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo
15706 15706 
 do :
15707 15707 
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15708 15708 
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
database/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
docs/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
etc/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
freshclam/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
libclamav/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
libclamav/c++/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ... 
@@ -5653,10 +5653,9 @@ distcheck: dist
5653 5653 
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
5654 5654 
 	  && am__cwd=`pwd` \
5655 5655 
 	  && $(am__cd) $(distdir)/_build \
5656 
-	  && ../configure \
5656 
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
5657 5657 
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
5658 5658 
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
5659 
-	    --srcdir=.. --prefix="$$dc_install_base" \
5660 5659 
 	  && $(MAKE) $(AM_MAKEFLAGS) \
5661 5660 
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
5662 5661 
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ... 
@@ -5746,8 +5745,8 @@ maintainer-clean-generic:
5746 5746 
 	@echo "This command is intended for maintainers to use"
5747 5747 
 	@echo "it deletes files that may require special tools to rebuild."
5748 5748 
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5749 
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5750 5749 
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5750 
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5751 5751 
 clean: clean-am
5752 5752
5753 5753 
 clean-am: clean-generic clean-libtool clean-local \
libclamav/c++/aclocal.m4
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1 
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
2 2
3 3 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
... ... 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
35 35 
 [am__api_version='1.14'
36 36 
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 37 
 dnl require some minimum version.  Point them to the right macro.
38 
-m4_if([$1], [1.14.1], [],
38 
+m4_if([$1], [1.14], [],
39 39 
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 40 
 ])
41 41
... ... 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
51 51 
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52 52 
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53 53 
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54 
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
54 
+[AM_AUTOMAKE_VERSION([1.14])dnl
55 55 
 m4_ifndef([AC_AUTOCONF_VERSION],
56 56 
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57 57 
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
libclamav/pdfng.c
History View file @ cc071bf
... ... 
@@ -127,7 +127,7 @@ char *pdf_convert_utf(char *begin, size_t sz)
127 127
128 128 
     return res;
129 129 
 #else
130 
-    res = cli_calloc(begin, sz+1);
130 
+    res = cli_calloc(sz+1, 1);
131 131 
     if ((res)) {
132 132 
         memcpy(res, begin, sz);
133 133 
         res[sz] = '\0';
libltdl/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
m4/reorganization/code_checks/functions.m4
History View file @ cc071bf
... ... 
@@ -2,7 +2,7 @@ AX_CHECK_UNAME_SYSCALL
2 2 
 AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
3 3 
 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
4 4
5 
-AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
5 
+AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])
6 6 
 AC_FUNC_FSEEKO
7 7
8 8 
 dnl Check if anon maps are available, check if we can determine the page size
sigtool/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
test/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
unit_tests/Makefile.in
History View file @ cc071bf
... ... 
@@ -1,4 +1,4 @@
1 
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1 
+# Makefile.in generated by automake 1.14 from Makefile.am.
2 2 
 # @configure_input@
3 3
4 4 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.