Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r90952:d130be27596c Date: 2017-04-04 20:47 +0200 http://bitbucket.org/pypy/pypy/changeset/d130be27596c/
Log: merge heads diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c b/rpython/rlib/rvmprof/src/shared/symboltable.c --- a/rpython/rlib/rvmprof/src/shared/symboltable.c +++ b/rpython/rlib/rvmprof/src/shared/symboltable.c @@ -8,7 +8,7 @@ #include <stdlib.h> #include <dlfcn.h> -#ifdef VMPROF_BACKTRACE +#if defined(VMPROF_BACKTRACE) || defined(VMPROF_LINUX) #include <link.h> #endif _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
