mirror of
https://github.com/NixOS/nix
synced 2025-06-25 14:51:16 +02:00
Fix some portability issues with the new C bindings
Build without GC is unbroken Fix #10403 Also building tests with Windows (assuming rest of Windows fixes) is unbroken.
This commit is contained in:
parent
19016c7b52
commit
c1e0769355
7 changed files with 25 additions and 13 deletions
|
@ -1,7 +1,6 @@
|
|||
#include "attr-set.hh"
|
||||
#include "config.hh"
|
||||
#include "eval.hh"
|
||||
#include "gc/gc.h"
|
||||
#include "globals.hh"
|
||||
#include "primops.hh"
|
||||
#include "value.hh"
|
||||
|
@ -13,8 +12,9 @@
|
|||
#include "nix_api_value.h"
|
||||
|
||||
#ifdef HAVE_BOEHMGC
|
||||
#define GC_INCLUDE_NEW 1
|
||||
#include "gc_cpp.h"
|
||||
# include "gc/gc.h"
|
||||
# define GC_INCLUDE_NEW 1
|
||||
# include "gc_cpp.h"
|
||||
#endif
|
||||
|
||||
// Helper function to throw an exception if value is null
|
||||
|
@ -444,7 +444,7 @@ void nix_list_builder_free(ListBuilder * list_builder)
|
|||
#if HAVE_BOEHMGC
|
||||
GC_FREE(list_builder);
|
||||
#else
|
||||
delete bb;
|
||||
delete list_builder;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue