StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6274

Browse Source 
begasus (2):
      feat(haiku): Don't use fstack-protector on Haiku
      feat(haiku): Haiku doesn't use sys/errno.h
This commit is contained in:
Anthony Bilinski 2021-01-23 19:38:32 -08:00
commit 5bb89f3e0b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -104,7 +104,7 @@ if (COMPILER_SUPPORTS_WDATE_TIME)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time")
endif() endif()
if (NOT WIN32) if (NOT WIN32 AND NOT HAIKU)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector")
endif() endif()

2
src/widget/qrwidget.cpp
View File

@ -25,7 +25,7 @@
#include <QPainter> #include <QPainter>
#include <qrencode.h> #include <qrencode.h>
#ifdef Q_OS_WIN32 #if defined(Q_OS_WIN32) || defined(Q_OS_HAIKU)
#include <errno.h> #include <errno.h>
#else #else
#include <sys/errno.h> #include <sys/errno.h>