diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /src/libmain/shared.cc | |
parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) |
Merge branch 'make'
Diffstat (limited to 'src/libmain/shared.cc')
-rw-r--r-- | src/libmain/shared.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 999b5023802c..fb70cb076732 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -15,10 +15,6 @@ #include <unistd.h> #include <signal.h> -#if HAVE_BOEHMGC -#include <gc/gc.h> -#endif - namespace nix { @@ -236,14 +232,6 @@ static void initAndRun(int argc, char * * argv) } -/* Called when the Boehm GC runs out of memory. */ -static void * oomHandler(size_t requested) -{ - /* Convert this to a proper C++ exception. */ - throw std::bad_alloc(); -} - - void showManPage(const string & name) { string cmd = "man " + name; @@ -273,14 +261,6 @@ int main(int argc, char * * argv) std::ios::sync_with_stdio(false); -#if HAVE_BOEHMGC - /* Initialise the Boehm garbage collector. This isn't necessary - on most platforms, but for portability we do it anyway. */ - GC_INIT(); - - GC_oom_fn = oomHandler; -#endif - try { try { initAndRun(argc, argv); |