@@ -34,6 +34,8 @@ endif

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libclamav.pc

+nodist_include_HEADERS = clamav-types.h

+

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

@@ -33,6 +33,7 @@

 #  MA 02110-1301, USA.

+

 VPATH = @srcdir@

 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'

 am__make_running_with_option = \

@@ -119,7 +120,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

 	$(top_srcdir)/docs/man/freshclam.conf.5.in \

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

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

-	$(top_srcdir)/docs/man/clamsubmit.1.in COPYING config/ar-lib \

+	$(top_srcdir)/docs/man/clamsubmit.1.in \

+	$(srcdir)/clamav-types.h.in COPYING config/ar-lib \

 	config/compile config/config.guess config/config.rpath \

 	config/config.sub config/install-sh config/missing \

 	config/ylwrap config/ltmain.sh $(top_srcdir)/config/ar-lib \

@@ -204,6 +206,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -216,7 +219,8 @@ CONFIG_CLEAN_FILES = clamav-config libclamav.pc platform.h \

 	docs/man/clambc.1 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 docs/man/clamsubmit.1

+	docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1 \

+	clamav-types.h

 CONFIG_CLEAN_VPATH_FILES =

 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

 am__vpath_adj = case $$p in \

@@ -245,7 +249,8 @@ am__uninstall_files_from_dir = { \

     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \

          $(am__cd) "$$dir" && rm -f $$files; }; \

   }

-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"

+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" \

+	"$(DESTDIR)$(includedir)"

 SCRIPTS = $(bin_SCRIPTS)

 AM_V_P = $(am__v_P_@AM_V@)

 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

@@ -275,6 +280,7 @@ am__can_run_installinfo = \

     *) (install-info --version) >/dev/null 2>&1;; \

   esac

 DATA = $(pkgconfig_DATA)

+HEADERS = $(nodist_include_HEADERS)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

   distclean-recursive maintainer-clean-recursive

 am__recursive_targets = \

@@ -394,6 +400,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -408,6 +416,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -422,6 +431,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -503,6 +517,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -583,6 +601,7 @@ EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.

 bin_SCRIPTS = clamav-config

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libclamav.pc

+nodist_include_HEADERS = clamav-types.h

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

@@ -681,6 +700,8 @@ docs/man/clamdtop.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamdt

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

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

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

+clamav-types.h: $(top_builddir)/config.status $(srcdir)/clamav-types.h.in

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

 install-binSCRIPTS: $(bin_SCRIPTS)

 	@$(NORMAL_INSTALL)

 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \

@@ -761,6 +782,27 @@ uninstall-pkgconfigDATA:

 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)

+install-nodist_includeHEADERS: $(nodist_include_HEADERS)

+	@$(NORMAL_INSTALL)

+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \

+	if test -n "$$list"; then \

+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \

+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \

+	fi; \

+	for p in $$list; do \

+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

+	  echo "$$d$$p"; \

+	done | $(am__base_list) | \

+	while read files; do \

+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \

+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \

+	done

+

+uninstall-nodist_includeHEADERS:

+	@$(NORMAL_UNINSTALL)

+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \

+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)

 # This directory's subdirectories are mostly independent; you can cd

 # into them and run 'make' without going through this Makefile.

@@ -1060,10 +1102,10 @@ distcleancheck: distclean

 	       exit 1; } >&2

 check-am: all-am

 check: check-recursive

-all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h

+all-am: Makefile $(SCRIPTS) $(DATA) $(HEADERS) clamav-config.h

 installdirs: installdirs-recursive

 installdirs-am:

-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \

+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \

 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

 	done

 install: install-recursive

@@ -1119,7 +1161,7 @@ info: info-recursive

 info-am:

-install-data-am: install-pkgconfigDATA

+install-data-am: install-nodist_includeHEADERS install-pkgconfigDATA

 install-dvi: install-dvi-recursive

@@ -1165,7 +1207,8 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

+uninstall-am: uninstall-binSCRIPTS uninstall-nodist_includeHEADERS \

+	uninstall-pkgconfigDATA

 .MAKE: $(am__recursive_targets) all install-am install-strip

@@ -1180,13 +1223,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

 	install-binSCRIPTS install-data install-data-am install-dvi \

 	install-dvi-am install-exec install-exec-am install-html \

 	install-html-am install-info install-info-am install-man \

-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \

-	install-ps-am install-strip installcheck installcheck-am \

-	installcheck-binSCRIPTS installdirs installdirs-am \

-	maintainer-clean maintainer-clean-generic mostlyclean \

-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

-	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \

-	uninstall-pkgconfigDATA

+	install-nodist_includeHEADERS install-pdf install-pdf-am \

+	install-pkgconfigDATA install-ps install-ps-am install-strip \

+	installcheck installcheck-am installcheck-binSCRIPTS \

+	installdirs installdirs-am maintainer-clean \

+	maintainer-clean-generic mostlyclean mostlyclean-generic \

+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \

+	uninstall-am uninstall-binSCRIPTS \

+	uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA

 lcov:

 	($(MAKE); cd unit_tests; $(MAKE) lcov)

@@ -178,6 +178,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -348,6 +349,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOLIBCLAMAV

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -362,6 +365,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -376,6 +380,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -457,6 +466,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

new file mode 100644

@@ -0,0 +1,84 @@

+/*

+ *  Copyright (C) 2015-2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2007-2008 Sourcefire, Inc.

+ *

+ *  Authors: Tomasz Kojm, Micah Snyder

+ *

+ *  @GENERATE_WARNING@

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License version 2 as

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

+#ifndef __CLAMAV_TYPES_H

+#define __CLAMAV_TYPES_H

+

+@INT_TYPES_HEADER@

+

+@INT8_DEF@

+@UINT8_DEF@

+

+@INT16_DEF@

+@UINT16_DEF@

+

+@INT32_DEF@

+@UINT32_DEF@

+

+@INT64_DEF@

+@UINT64_DEF@

+

+/* Ensure we have print format types */

+/* PRIu64 should be in <inttypes.h> */

+#ifndef _SF64_PREFIX

+    @DEFINE_SF64_PREFIX@

+#endif

+

+#ifndef PRIu64

+    #define PRIu64 _SF64_PREFIX "u"

+#endif

+#ifndef PRIx64

+    #define PRIx64 _SF64_PREFIX "i"

+#endif

+#ifndef PRIi64

+    #define PRIi64 _SF64_PREFIX "x"

+#endif

+

+#ifndef STDu64

+    #define STDu64 "%" PRIu64

+    #define STDi64 "%" PRIi64

+    #define STDx64 "%" PRIx64

+#endif

+

+/* PRIu32 should also be in <inttypes.h> */

+#ifndef PRIu32

+    #ifndef _SF32_PREFIX

+        @DEFINE_SF32_PREFIX@

+    #endif

+

+    #define PRIu32 _SF32_PREFIX "u"

+    #define PRIi32 _SF32_PREFIX "i"

+    #define PRIx32 _SF32_PREFIX "x"

+#endif

+

+#ifndef STDu32

+    #define STDu32 "%" PRIu32

+    #define STDi32 "%" PRIi32

+    #define STDx32 "%" PRIx32

+#endif

+

+#ifndef INT32_MAX

+    #define INT32_MAX 2147483647

+#endif

+

+#endif

@@ -159,6 +159,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -284,6 +285,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -298,6 +301,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -312,6 +316,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -393,6 +402,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -23,7 +23,6 @@

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

-#include "cltypes.h"

 #ifndef _WIN32

 #include <sys/time.h>

 #endif

@@ -177,6 +177,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -302,6 +303,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -316,6 +319,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -330,6 +334,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -411,6 +420,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -180,6 +180,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -359,6 +360,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -373,6 +376,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -387,6 +391,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -468,6 +477,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -29,7 +29,7 @@

 #include <stdlib.h>

 #include "shared/optparser.h"

 #include "thrmgr.h"

-#include "cltypes.h"

+#include "clamav-types.h"

 enum mode {

     MODE_COMMAND,

@@ -61,7 +61,6 @@

 #include "shared.h"

 #include "libclamav/others.h"

 #include "libclamav/readdb.h"

-#include "libclamav/cltypes.h"

 #define BUFFSIZE 1024

@@ -177,6 +177,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -313,6 +314,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -327,6 +330,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -341,6 +345,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -422,6 +431,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -159,6 +159,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -319,6 +320,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -333,6 +336,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -347,6 +351,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -428,6 +437,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -178,6 +178,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -304,6 +305,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -318,6 +321,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -332,6 +336,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -413,6 +422,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -63,7 +63,6 @@

 #include "libclamav/matcher-pcre.h"

 #include "libclamav/str.h"

 #include "libclamav/readdb.h"

-#include "libclamav/cltypes.h"

 #ifdef C_LINUX

 dev_t procdev;

@@ -177,6 +177,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

 	$(top_srcdir)/m4/reorganization/strni.m4 \

+	$(top_srcdir)/m4/reorganization/types.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -302,6 +303,8 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

+DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@

+DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@

 DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

@@ -316,6 +319,7 @@ FGREP = @FGREP@

 FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GCOV = @GCOV@

+GENERATE_WARNING = @GENERATE_WARNING@

 GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

@@ -330,6 +334,11 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

+INT16_DEF = @INT16_DEF@

+INT32_DEF = @INT32_DEF@

+INT64_DEF = @INT64_DEF@

+INT8_DEF = @INT8_DEF@

+INT_TYPES_HEADER = @INT_TYPES_HEADER@

 JSON_CPPFLAGS = @JSON_CPPFLAGS@

 JSON_LDFLAGS = @JSON_LDFLAGS@

 JSON_LIBS = @JSON_LIBS@

@@ -411,6 +420,10 @@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@

 SYSTEMD_LIBS = @SYSTEMD_LIBS@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

+UINT16_DEF = @UINT16_DEF@

+UINT32_DEF = @UINT32_DEF@

+UINT64_DEF = @UINT64_DEF@

+UINT8_DEF = @UINT8_DEF@

 VERSION = @VERSION@

 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@

 WERR_CFLAGS = @WERR_CFLAGS@

@@ -646,6 +646,18 @@ am__EXEEXT_FALSE

 am__EXEEXT_TRUE

 LTLIBOBJS

 LIBOBJS

+DEFINE_SF64_PREFIX

+DEFINE_SF32_PREFIX

+INT_TYPES_HEADER

+UINT64_DEF

+INT64_DEF

+UINT32_DEF

+INT32_DEF

+UINT16_DEF

+INT16_DEF

+UINT8_DEF

+INT8_DEF

+GENERATE_WARNING

 HAVE_STRNI

 JSON_LDFLAGS

 JSON_LIBS

@@ -29181,7 +29193,148 @@ else

     mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"

 fi

-ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile fuzz/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 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 docs/man/clamsubmit.1"

+ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile fuzz/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 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 docs/man/clamsubmit.1 clamav-types.h"

+

+

+# Define variables needed to generate clamav-types.h.

+# Define a warning for the user, so they don't edit clamav-types.h

+GENERATE_WARNING="Warning: This file is generated with ./configure. Do not edit!"

+

+

+# Initialize definitions to empty strings, in case they're not needed.

+INT8_DEF=""

+

+UINT8_DEF=""

+

+INT16_DEF=""

+

+UINT16_DEF=""

+

+INT32_DEF=""

+

+UINT32_DEF=""

+

+INT64_DEF=""

+

+UINT64_DEF=""

+

+

+# Check sys/int_types.h first, to give it higher priority on Solaris

+ac_fn_c_check_header_mongrel "$LINENO" "sys/int_types.h" "ac_cv_header_sys_int_types_h" "$ac_includes_default"

+if test "x$ac_cv_header_sys_int_types_h" = xyes; then :

+           INT_TYPES_HEADER="#include <sys/int_types.h>"

+

+

+else

+           ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"

+if test "x$ac_cv_header_inttypes_h" = xyes; then :

+                   INT_TYPES_HEADER="#include <inttypes.h>"

+

+

+else

+                   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"

+if test "x$ac_cv_header_stdint_h" = xyes; then :

+                           INT_TYPES_HEADER="#include <stdint.h>"

+

+

+else

+                           cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+

+                                        #ifndef _MSC_VER

+                                            error: _MSC_VER not found!

+                                        #endif

+

+

+int

+main ()

+{

+

+  ;

+  return 0;

+}

+

+_ACEOF

+if ac_fn_c_try_compile "$LINENO"; then :

+                                   INT_TYPES_HEADER="#include <stdint.h>"

+

+

+else

+                                   INT8_DEF="typedef signed char int8_t;"

+

+                                UINT8_DEF="typedef unsigned char uint8_t;"

+

+

+                                if test $ac_cv_sizeof_int = 2; then

+                                    INT16_DEF="typedef signed int int16_t;"

+

+                                    UINT16_DEF="typedef unsigned int uint16_t;"

+

+                                elif test $ac_cv_sizeof_short = 2; then

+                                    INT16_DEF="typedef signed short int16_t;"

+

+                                    UINT16_DEF="typedef unsigned short uint16_t;"

+

+                                fi

+

+                                if test $ac_cv_sizeof_int = 4; then

+                                    INT32_DEF="typedef signed int int32_t;"

+

+                                    UINT32_DEF="typedef unsigned int uint32_t;"

+

+                                elif test $ac_cv_sizeof_long = 4; then

+                                    INT32_DEF="typedef signed long int32_t;"

+

+                                    UINT32_DEF="typedef unsigned long uint32_t;"

+

+                                fi

+