@@ -19,7 +19,7 @@

 ACLOCAL_AMFLAGS=-I m4

 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop clambc

-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256

+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in

 bin_SCRIPTS=clamav-config

@@ -58,7 +58,7 @@ subdir = .

 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \

 	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \

-	$(top_srcdir)/configure \

+	$(srcdir)/platform.h.in $(top_srcdir)/configure \

 	$(top_srcdir)/docs/man/clamav-milter.8.in \

 	$(top_srcdir)/docs/man/clamconf.1.in \

 	$(top_srcdir)/docs/man/clamd.8.in \

@@ -88,7 +88,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

  configure.lineno config.status.lineno

 mkinstalldirs = $(install_sh) -d

 CONFIG_HEADER = clamav-config.h

-CONFIG_CLEAN_FILES = clamav-config libclamav.pc \

+CONFIG_CLEAN_FILES = clamav-config libclamav.pc platform.h \

 	docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 \

 	docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 \

 	docs/man/freshclam.1 docs/man/freshclam.conf.5 \

@@ -335,7 +335,7 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 ACLOCAL_AMFLAGS = -I m4

 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop clambc

-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256

+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in

 bin_SCRIPTS = clamav-config

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libclamav.pc

@@ -444,6 +444,8 @@ clamav-config: $(top_builddir)/config.status $(srcdir)/clamav-config.in

 	cd $(top_builddir) && $(SHELL) ./config.status $@

 libclamav.pc: $(top_builddir)/config.status $(srcdir)/libclamav.pc.in

 	cd $(top_builddir) && $(SHELL) ./config.status $@

+platform.h: $(top_builddir)/config.status $(srcdir)/platform.h.in

+	cd $(top_builddir) && $(SHELL) ./config.status $@

 docs/man/clamav-milter.8: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamav-milter.8.in

 	cd $(top_builddir) && $(SHELL) ./config.status $@

 docs/man/clamconf.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamconf.1.in

@@ -19755,7 +19755,7 @@ else

 fi

-ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"

+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

@@ -20807,6 +20807,7 @@ do

     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

     "clamav-config") CONFIG_FILES="$CONFIG_FILES clamav-config" ;;

     "libclamav.pc") CONFIG_FILES="$CONFIG_FILES libclamav.pc" ;;

+    "platform.h") CONFIG_FILES="$CONFIG_FILES platform.h" ;;

     "docs/man/clamav-milter.8") CONFIG_FILES="$CONFIG_FILES docs/man/clamav-milter.8" ;;

     "docs/man/clamconf.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamconf.1" ;;

     "docs/man/clamd.8") CONFIG_FILES="$CONFIG_FILES docs/man/clamd.8" ;;

@@ -1600,6 +1600,7 @@ clambc/Makefile

 Makefile

 clamav-config

 libclamav.pc

+platform.h

 docs/man/clamav-milter.8

 docs/man/clamconf.1

 docs/man/clamd.8

deleted file mode 100644

@@ -1,36 +0,0 @@

-#ifndef _WIN32

-#define closesocket(s) close(s)

-#endif

-

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

-#ifndef	FALSE

-#define FALSE (0)

-#endif

-#ifndef	TRUE

-#define TRUE (1)

-#endif

-

-#ifndef MIN

-#define MIN(a, b)	(((a) < (b)) ? (a) : (b))

-#endif

-#ifndef MAX

-#define MAX(a,b)	(((a) > (b)) ? (a) : (b))

-#endif

-

-#ifndef HAVE_IN_PORT_T

-typedef	unsigned	short	in_port_t;

-#endif

-

-#ifndef HAVE_IN_ADDR_T

-typedef	unsigned	int	in_addr_t;

-#endif

-

-#ifdef _WIN32

-#define PATHSEP "\\"

-#else

-#define PATHSEP "/"

-#endif

-

new file mode 100644

@@ -0,0 +1,36 @@

+#ifndef _WIN32

+#define closesocket(s) close(s)

+#endif

+

+#ifndef O_BINARY

+#define O_BINARY 0

+#endif

+

+#ifndef	FALSE

+#define FALSE (0)

+#endif

+#ifndef	TRUE

+#define TRUE (1)

+#endif

+

+#ifndef MIN

+#define MIN(a, b)	(((a) < (b)) ? (a) : (b))

+#endif

+#ifndef MAX

+#define MAX(a,b)	(((a) > (b)) ? (a) : (b))

+#endif

+

+#ifndef HAVE_IN_PORT_T

+typedef	unsigned	short	in_port_t;

+#endif

+

+#ifndef HAVE_IN_ADDR_T

+typedef	unsigned	int	in_addr_t;

+#endif

+

+#ifdef _WIN32

+#define PATHSEP "\\"

+#else

+#define PATHSEP "/"

+#endif

+