10000 GH-132983: Remove zstd version check in the header file (#133502) · python/cpython@f869190 · GitHub
[go: up one dir, main page]
Skip to content

Commit f869190

Browse files
AA-TurnerAA-Turner
authored
GH-132983: Remove zstd version check in the header file (#133502)
1 parent bf8bbe9 commit f869190

File tree

4 files changed

+4
-219
lines changed

4 files changed

+4
-219
lines changed

‎Modules/_zstd/_zstdmodule.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ Python module.
1212
#include "zdict.h"
1313

1414

15-
// if you update the minimum version, you should update the compile
16-
// check in configure.ac
17-
#define PYTHON_MINIMUM_SUPPORTED_ZSTD_VERSION 10405
18-
19-
#if ZSTD_VERSION_NUMBER < PYTHON_MINIMUM_SUPPORTED_ZSTD_VERSION
20-
#error "_zstd module requires zstd v1.4.5+"
21-
#endif
22-
2315
/* Forward declaration of module state */
2416
typedef struct _zstd_state _zstd_state;
2517

‎configure

Lines changed: 2 additions & 190 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5386,21 +5386,8 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
53865386
])
53875387
])
53885388

5389-
dnl zstd 1.4.5 added ZDICT_finalizeDictionary
5390-
PKG_CHECK_MODULES([LIBZSTD], [libzstd >= 1.4.5], [have_libzstd=yes], [
5391-
WITH_SAVE_ENV([
5392-
CPPFLAGS="$CPPFLAGS $LIBZSTD_CFLAGS"
5393-
LIBS="$LIBS $LIBZSTD_LIBS"
5394-
AC_CHECK_HEADERS([zstd.h zdict.h], [
5395-
PY_CHECK_LIB([zstd], [ZDICT_finalizeDictionary],
5396-
[have_libzstd=yes], [have_libzstd=no])
5397-
], [have_libzstd=no])
5398-
AS_VAR_IF([have_libzstd], [yes], [
5399-
LIBZSTD_CFLAGS=${LIBZSTD_CFLAGS-""}
5400-
LIBZSTD_LIBS=${LIBZSTD_LIBS-"-lzstd"}
5401-
])
5402-
])
5403-
])
5389+
dnl zstd 1.4.5 stabilised ZDICT_finalizeDictionary
5390+
PKG_CHECK_MODULES([LIBZSTD], [libzstd >= 1.4.5], [have_libzstd=yes], [have_libzstd=no])
54045391

54055392
dnl PY_CHECK_NETDB_FUNC(FUNCTION)
54065393
AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [@%:@include <netdb.h>])])

‎pyconfig.h.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,18 +1630,12 @@
16301630
/* Define to 1 if you have the 'writev' function. */
16311631
#undef HAVE_WRITEV
16321632

1633-
/* Define to 1 if you have the <zdict.h> header file. */
1634-
#undef HAVE_ZDICT_H
1635-
16361633
/* Define if the zlib library has inflateCopy */
16371634
#undef HAVE_ZLIB_COPY
16381635

16391636
/* Define to 1 if you have the <zlib.h> header file. */
16401637
#undef HAVE_ZLIB_H
16411638

1642-
/* Define to 1 if you have the <zstd.h> header file. */
1643-
#undef HAVE_ZSTD_H
1644-
16451639
/* Define to 1 if you have the '_getpty' function. */
16461640
#undef HAVE__GETPTY
16471641

0 commit comments

Comments
 (0)
0