diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index f770e9937cd7240d9fc1ae31e0ce7613b48539df..fcef77210254767bed88b0ba8cac5a6d1825380e 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -2,6 +2,8 @@ $Id$ 2022-04-30 Christian Franke <franke@computer.org> + Makefile.am: config-vc: Remove HAVE___INT128 from generated config.h. + Makefile.am: Support 'svnversion' with CR/LF instead of LF output. dev_jmb39x_raid.cpp: Enhance LBA range from 33-62 to 1-255 (#1594). diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am index 01f72f862dad0df47a149eb8fc486bad466a8b1d..c70b0cb3a023467babd391bb0045119b934098d5 100644 --- a/smartmontools/Makefile.am +++ b/smartmontools/Makefile.am @@ -1068,7 +1068,7 @@ config-vc: check-vc-version $(CONFIG_VC_FILES) $(srcdir)/os_win32/vc$(vcver)/config.h: config.h Makefile sed -e '1i/* os_win32/vc$(vcver)/config.h. Generated from config.h by Makefile. */' \ - -e 's,^#define HAVE_\(ATTR_PACKED\|CLOCK_GETTIME\|GETTIMEOFDAY\|LONG_DOUBLE_WIDER\|STRINGS_H\|UNISTD_H\) 1$$,/* #undef HAVE_\1 */ /* VC$(vcver) */,' \ + -e 's,^#define HAVE_\(ATTR_PACKED\|CLOCK_GETTIME\|GETTIMEOFDAY\|__INT128\|LONG_DOUBLE_WIDER\|STRINGS_H\|UNISTD_H\) 1.*$$,/* #undef HAVE_\1 */ /* VC$(vcver) */,' \ -e 's,^\(#define SMARTMONTOOLS_BUILD_HOST "[^-]*\)[^"]*,\1-pc-w32vc$(vcver),' $< > $@ $(srcdir)/os_win32/vc$(vcver)/svnversion.h: svnversion.h