You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

27 lines
740 B

  1. From c132a2aa53f3a4ca0ab26395a4936ecf3fd030f2 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Fri, 13 Dec 2019 21:50:06 -0800
  4. Subject: [PATCH] common.cpp: Don't always include cxxabi.h
  5. cxxabi.h is not available with LLVM's libcxx
  6. ---
  7. src/common.cpp | 5 ++++-
  8. 1 file changed, 4 insertions(+), 1 deletion(-)
  9. diff --git a/src/common.cpp b/src/common.cpp
  10. index cfa4cb0d81..96873f17a9 100644
  11. --- a/src/common.cpp
  12. +++ b/src/common.cpp
  13. @@ -1,8 +1,11 @@
  14. // Various functions, mostly string utilities, that are used by most parts of fish.
  15. #include "config.h"
  16. -#include <ctype.h>
  17. +#ifdef HAVE_BACKTRACE_SYMBOLS
  18. #include <cxxabi.h>
  19. +#endif
  20. +
  21. +#include <ctype.h>
  22. #include <dlfcn.h>
  23. #include <errno.h>
  24. #include <fcntl.h>