Skip to content

Commit 68ba6ff

Browse files
authored
Merge pull request #11558 from DeterminateSystems/fix-no-gc-build
Fix build without GC
2 parents c5c6855 + ec47133 commit 68ba6ff

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/libexpr-c/nix_api_expr.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#if HAVE_BOEHMGC
1818
# include <mutex>
19-
# define GC_INCLUDE_NEW 1
20-
# include "gc_cpp.h"
2119
#endif
2220

2321
nix_err nix_libexpr_init(nix_c_context * context)

src/libexpr/eval-gc.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ template<typename T>
2323
using gc_allocator = std::allocator<T>;
2424

2525
# define GC_MALLOC_ATOMIC std::malloc
26-
# define GC_STRDUP std::strdup
26+
# define GC_STRDUP strdup
27+
2728
struct gc
2829
{};
2930

0 commit comments

Comments
 (0)