Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build without GC #11558

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Fix build without GC #11558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0885694
Fix build without GC
edolstra Sep 20, 2024
ec47133
Fix warning
edolstra Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/libexpr-c/nix_api_expr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

#if HAVE_BOEHMGC
# include <mutex>
# define GC_INCLUDE_NEW 1
# include "gc_cpp.h"
#endif

nix_err nix_libexpr_init(nix_c_context * context)
Expand Down
3 changes: 2 additions & 1 deletion src/libexpr/eval-gc.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ template<typename T>
using gc_allocator = std::allocator<T>;

# define GC_MALLOC_ATOMIC std::malloc
# define GC_STRDUP std::strdup
# define GC_STRDUP strdup

struct gc
{};

Expand Down
Loading