summaryrefslogtreecommitdiff
authoreilers <eilers>2004-04-10 13:29:30 (UTC)
committer eilers <eilers>2004-04-10 13:29:30 (UTC)
commit8350779f2628ce800b4bca7cef7d2b9bb644879e (patch) (side-by-side diff)
tree90895aef8cede58449905601406e1119cd5d4a29
parent24fcd64ca69588f3f6364dbc5e14df9f1686134a (diff)
downloadopie-8350779f2628ce800b4bca7cef7d2b9bb644879e.zip
opie-8350779f2628ce800b4bca7cef7d2b9bb644879e.tar.gz
opie-8350779f2628ce800b4bca7cef7d2b9bb644879e.tar.bz2
resource.h must stay behind time.h to compile on mac
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/qprocess_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/qprocess_unix.cpp b/core/launcher/qprocess_unix.cpp
index d62e4e6..56e1b1d 100644
--- a/core/launcher/qprocess_unix.cpp
+++ b/core/launcher/qprocess_unix.cpp
@@ -19,69 +19,69 @@
**********************************************************************/
// Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED.
#if defined(connect)
#undef connect
#endif
#include "qprocess.h"
/* OPIE */
#include <opie2/odebug.h>
using namespace Opie::Core;
/* QT */
#ifndef QT_NO_PROCESS
#include <qapplication.h>
#include <qqueue.h>
#include <qlist.h>
#include <qsocketnotifier.h>
#include <qtimer.h>
#include <qregexp.h>
#include "qcleanuphandler_p.h"
/* STD */
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <sys/fcntl.h>
-#include <sys/resource.h>
#include <errno.h>
#ifdef Q_OS_MACX
#include <sys/time.h>
#endif
+#include <sys/resource.h>
#ifdef __MIPSEL__
# ifndef SOCK_DGRAM
# define SOCK_DGRAM 1
# endif
# ifndef SOCK_STREAM
# define SOCK_STREAM 2
# endif
#endif
//#define QT_QPROCESS_DEBUG
#ifdef Q_C_CALLBACKS
extern "C" {
#endif // Q_C_CALLBACKS
#define QT_SIGNAL_RETTYPE void
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
QT_SIGNAL_RETTYPE qt_C_sigchldHnd(QT_SIGNAL_ARGS);
QT_SIGNAL_RETTYPE qt_C_sigpipeHnd(QT_SIGNAL_ARGS);
#ifdef Q_C_CALLBACKS
}
#endif // Q_C_CALLBACKS
class QProc;
class QProcessManager;
class QProcessPrivate