| author | llornkcor <llornkcor> | 2005-08-04 07:22:40 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2005-08-04 07:22:40 (UTC) |
| commit | 77825e5455872ef0c6def793b38bc767a3838bc0 (patch) (side-by-side diff) | |
| tree | adff22adfee3d6a17dd9e0a76ccc51f2a2a20a1f | |
| parent | 32743ebb00d374ad18afbed69ab3e94b03699a57 (diff) | |
| download | opie-77825e5455872ef0c6def793b38bc767a3838bc0.zip opie-77825e5455872ef0c6def793b38bc767a3838bc0.tar.gz opie-77825e5455872ef0c6def793b38bc767a3838bc0.tar.bz2 | |
apply patch in # 0001662, fixes build with uclibc
| -rw-r--r-- | core/opie-login/main.cpp | 5 | ||||
| -rw-r--r-- | noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp | 4 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 554efd3..3f1077c 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -150,10 +150,13 @@ int main ( int argc, char **argv ) QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer ); app-> setFont ( QFont ( "Helvetica", 10 )); app-> setStyle ( new QPEStyle ( )); -// const char *sig = ::strsignal ( killedbysig ); +#ifndef __UCLIBC__ const char *sig = ::sys_siglist[killedbysig]; +#else + const char *sig = ::strsignal ( killedbysig ); +#endif QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); l-> setAlignment ( Qt::AlignCenter ); l-> move ( 0, 0 ); diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp b/noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp index 09605bd..ff06551 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp +++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp @@ -1,6 +1,10 @@ #include "ProcessInvoker.h" +#ifndef PIPE_BUF // uClibc or similar +#include <linux/limits.h> +#endif + static ProcessInvoker* g_this; /* ------------------------------------------------------------------------ */ /* static functions */ /* ------------------------------------------------------------------------ */ diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index ac6e1fa..8de9aa1 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp @@ -49,9 +49,9 @@ using namespace Opie::Ui; #include <time.h> #include <stdio.h> #include <stdlib.h> #include <math.h> -#if defined (__GNUC__) && (__GNUC__ < 3) +#if (defined (__GNUC__) && (__GNUC__ < 3)) || defined(__UCLIBC__) #define round qRound #endif extern "C" |