Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@76ef336
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#13433 from lnkuiper/jemalloc_32bit
Merge pull request duckdb/duckdb#13418 from Tishj/produce_arrow_pycapsule
  • Loading branch information
krlmlr committed Aug 15, 2024
1 parent 52dc803 commit 57e05b5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/duckdb/src/common/allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#endif

#ifndef USE_JEMALLOC
#if defined(DUCKDB_EXTENSION_JEMALLOC_LINKED) && DUCKDB_EXTENSION_JEMALLOC_LINKED && !defined(WIN32)
#if defined(DUCKDB_EXTENSION_JEMALLOC_LINKED) && DUCKDB_EXTENSION_JEMALLOC_LINKED && !defined(WIN32) && \
INTPTR_MAX == INT64_MAX
#define USE_JEMALLOC
#endif
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "1-dev4172"
#define DUCKDB_PATCH_VERSION "1-dev4179"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 0
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.0.1-dev4172"
#define DUCKDB_VERSION "v1.0.1-dev4179"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "a2a7ec2c82"
#define DUCKDB_SOURCE_ID "76ef33668a"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit 57e05b5

Please sign in to comment.