From aed8ce9da277f5ecffe968b324f242c41c3b752a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 10:50:31 +0200 Subject: Adding upstream version 2:9.0.1378. Signed-off-by: Daniel Baumann --- src/xdiff/xinclude.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 src/xdiff/xinclude.h (limited to 'src/xdiff/xinclude.h') diff --git a/src/xdiff/xinclude.h b/src/xdiff/xinclude.h new file mode 100644 index 0000000..6e9f50a --- /dev/null +++ b/src/xdiff/xinclude.h @@ -0,0 +1,71 @@ +/* + * LibXDiff by Davide Libenzi ( File Differential Library ) + * Copyright (C) 2003 Davide Libenzi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * . + * + * Davide Libenzi + * + */ + +// The following includes come from Vim: + +// defines HAVE_ATTRIBUTE_UNUSED +#ifdef HAVE_CONFIG_H +# ifdef VMS +# include "[.auto]config.h" +# else +# include "../auto/config.h" +# endif +#endif + +// Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter +// can be used to check for mistakes. +#if defined(HAVE_ATTRIBUTE_UNUSED) || defined(__MINGW32__) +# define UNUSED __attribute__((unused)) +#else +# define UNUSED +#endif + +#if defined(_MSC_VER) +# define inline __inline +#endif + +#if !defined(XINCLUDE_H) +#define XINCLUDE_H + +// This effectively re-verts b46054b3746271d23feab0 from git +#include +#include +#include +#if !defined(_WIN32) +#include +#endif +#include +#include +// This include comes from git, so uncomment it +#if 0 +#include "git-compat-util.h" +#endif +#include "xmacros.h" +#include "xdiff.h" +#include "xtypes.h" +#include "xutils.h" +#include "xprepare.h" +#include "xdiffi.h" +#include "xemit.h" + + +#endif /* #if !defined(XINCLUDE_H) */ -- cgit v1.2.3