mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-02 21:18:51 +02:00
70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From a824ee4bf0a5f9914232352282507bee339b0331 Mon Sep 17 00:00:00 2001
|
|
From: Augustin Cavalier <waddlesplash@gmail.com>
|
|
Date: Tue, 21 Jul 2015 18:48:26 -0400
|
|
Subject: [PATCH] Fixes to build on Haiku.
|
|
|
|
---
|
|
qtools/qglobal.h | 6 ++++--
|
|
qtools/qthread_unix.cpp | 2 +-
|
|
src/doxygen.cpp | 2 +-
|
|
3 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
|
|
index c3f7594..997fd92 100644
|
|
--- a/qtools/qglobal.h
|
|
+++ b/qtools/qglobal.h
|
|
@@ -1,5 +1,5 @@
|
|
/****************************************************************************
|
|
-**
|
|
+**
|
|
**
|
|
** Global type declarations and definitions
|
|
**
|
|
@@ -134,6 +134,8 @@
|
|
#define _OS_CYGWIN_
|
|
#elif defined(__BEOS__)
|
|
#define _OS_BEOS_
|
|
+#elif defined(__HAIKU__)
|
|
+#define _OS_HAIKU_
|
|
#elif defined(__MINT__)
|
|
#define _OS_MINT_
|
|
#else
|
|
@@ -276,7 +278,7 @@
|
|
#define _CC_V2002
|
|
#else
|
|
#define _CC_V1998
|
|
-#endif
|
|
+#endif
|
|
#endif
|
|
|
|
#ifndef Q_PACKED
|
|
diff --git a/qtools/qthread_unix.cpp b/qtools/qthread_unix.cpp
|
|
index b536583..ab4c8fc 100644
|
|
--- a/qtools/qthread_unix.cpp
|
|
+++ b/qtools/qthread_unix.cpp
|
|
@@ -132,7 +132,7 @@ void QThread::start()
|
|
pthread_attr_t attr;
|
|
pthread_attr_init(&attr);
|
|
pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
|
|
- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
|
|
+ //pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
|
|
if (d->stackSize>0)
|
|
{
|
|
#if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0)
|
|
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
|
|
index 647b5c8..ca66123 100644
|
|
--- a/src/doxygen.cpp
|
|
+++ b/src/doxygen.cpp
|
|
@@ -10277,7 +10277,7 @@ void readConfiguration(int argc, char **argv)
|
|
{
|
|
if (optind+4<argc || QFileInfo("Doxyfile").exists())
|
|
{
|
|
- QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile");
|
|
+ QCString df = optind+4<argc ? (QCString)argv[optind+4] : QCString("Doxyfile");
|
|
if (!Config::instance()->parse(df))
|
|
{
|
|
err("error opening or reading configuration file %s!\n",argv[optind+4]);
|
|
--
|
|
2.2.2
|
|
|