From 7aa266545dabf9934ccd44d4fc836040497159be Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sun, 1 Feb 2015 13:41:08 +0100 Subject: [PATCH 3/3] Fix conflict between musl libc and lss Include late to avoid the macro getdents64 in musl libc's to conflict with linux_sycall_support.h. --- src/client/linux/crash_generation/crash_generation_server.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc index 26c50a5c..2596afde 100644 --- a/src/client/linux/crash_generation/crash_generation_server.cc +++ b/src/client/linux/crash_generation/crash_generation_server.cc @@ -28,7 +28,6 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include #include #include #include @@ -49,6 +48,8 @@ #include "common/linux/guid_creator.h" #include "common/linux/safe_readlink.h" +#include + static const char kCommandQuit = 'x'; namespace google_breakpad { -- 2.14.1