From 6b39e8fd1ba6beebbd2970f6e9e9b0892ba288a4 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sat, 30 Apr 2022 15:39:58 +0000 Subject: [PATCH] Makefile.am: config-vc: Remove HAVE___INT128 from generated config.h. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5368 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/ChangeLog | 2 ++ smartmontools/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index f770e9937..fcef77210 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 01f72f862..c70b0cb3a 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 -- GitLab