author | llornkcor <llornkcor> | 2005-08-04 07:22:40 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-08-04 07:22:40 (UTC) |
commit | 77825e5455872ef0c6def793b38bc767a3838bc0 (patch) (unidiff) | |
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 | |||
@@ -148,14 +148,17 @@ int main ( int argc, char **argv ) | |||
148 | 148 | ||
149 | QWSServer::setDesktopBackground ( QImage ( )); | 149 | QWSServer::setDesktopBackground ( QImage ( )); |
150 | QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer ); | 150 | QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer ); |
151 | app-> setFont ( QFont ( "Helvetica", 10 )); | 151 | app-> setFont ( QFont ( "Helvetica", 10 )); |
152 | app-> setStyle ( new QPEStyle ( )); | 152 | app-> setStyle ( new QPEStyle ( )); |
153 | 153 | ||
154 | // const char *sig = ::strsignal ( killedbysig ); | 154 | #ifndef __UCLIBC__ |
155 | const char *sig = ::sys_siglist[killedbysig]; | 155 | const char *sig = ::sys_siglist[killedbysig]; |
156 | #else | ||
157 | const char *sig = ::strsignal ( killedbysig ); | ||
158 | #endif | ||
156 | QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); | 159 | QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); |
157 | l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); | 160 | l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); |
158 | l-> setAlignment ( Qt::AlignCenter ); | 161 | l-> setAlignment ( Qt::AlignCenter ); |
159 | l-> move ( 0, 0 ); | 162 | l-> move ( 0, 0 ); |
160 | l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); | 163 | l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); |
161 | l-> show ( ); | 164 | l-> show ( ); |
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,8 +1,12 @@ | |||
1 | #include "ProcessInvoker.h" | 1 | #include "ProcessInvoker.h" |
2 | 2 | ||
3 | #ifndef PIPE_BUF // uClibc or similar | ||
4 | #include <linux/limits.h> | ||
5 | #endif | ||
6 | |||
3 | static ProcessInvoker* g_this; | 7 | static ProcessInvoker* g_this; |
4 | /* ------------------------------------------------------------------------ */ | 8 | /* ------------------------------------------------------------------------ */ |
5 | /* static functions */ | 9 | /* static functions */ |
6 | /* ------------------------------------------------------------------------ */ | 10 | /* ------------------------------------------------------------------------ */ |
7 | 11 | ||
8 | static Sigfunc* setSignalHandler(int signo, Sigfunc* handler) | 12 | static Sigfunc* setSignalHandler(int signo, Sigfunc* handler) |
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 | |||
@@ -47,13 +47,13 @@ using namespace Opie::Ui; | |||
47 | 47 | ||
48 | /* STD */ | 48 | /* STD */ |
49 | #include <time.h> | 49 | #include <time.h> |
50 | #include <stdio.h> | 50 | #include <stdio.h> |
51 | #include <stdlib.h> | 51 | #include <stdlib.h> |
52 | #include <math.h> | 52 | #include <math.h> |
53 | #if defined (__GNUC__) && (__GNUC__ < 3) | 53 | #if (defined (__GNUC__) && (__GNUC__ < 3)) || defined(__UCLIBC__) |
54 | #define round qRound | 54 | #define round qRound |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | extern "C" | 57 | extern "C" |
58 | { | 58 | { |
59 | void BenchFFT( void ); | 59 | void BenchFFT( void ); |