summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-04 07:22:40 (UTC)
committer llornkcor <llornkcor>2005-08-04 07:22:40 (UTC)
commit77825e5455872ef0c6def793b38bc767a3838bc0 (patch) (side-by-side diff)
treeadff22adfee3d6a17dd9e0a76ccc51f2a2a20a1f
parent32743ebb00d374ad18afbed69ab3e94b03699a57 (diff)
downloadopie-77825e5455872ef0c6def793b38bc767a3838bc0.zip
opie-77825e5455872ef0c6def793b38bc767a3838bc0.tar.gz
opie-77825e5455872ef0c6def793b38bc767a3838bc0.tar.bz2
apply patch in # 0001662, fixes build with uclibc
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp5
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/anylnk/ProcessInvoker.cpp4
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp2
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
@@ -130,50 +130,53 @@ int main ( int argc, char **argv )
}
if ( WIFSIGNALED( status )) {
switch ( WTERMSIG( status )) {
case SIGTERM:
case SIGINT :
case SIGKILL:
break;
default :
killedbysig = WTERMSIG( status );
break;
}
}
if ( killedbysig ) { // qpe was killed by an uncaught signal
qApp = 0;
::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
QWSServer::setDesktopBackground ( QImage ( ));
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 );
l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
l-> show ( );
QTimer::singleShot ( 3000, app, SLOT( quit()));
app-> exec ( );
delete app;
qApp = 0;
}
}
else {
if ( !autolog ) {
QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf";
Config cfg ( confFile, Config::File );
cfg. setGroup ( "General" );
QString user = cfg. readEntry ( "AutoLogin" );
if ( !user. isEmpty ( ))
autolog = ::strdup ( user. latin1 ( ));
}
if ( autolog && !userExited ) {
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,26 +1,30 @@
#include "ProcessInvoker.h"
+#ifndef PIPE_BUF // uClibc or similar
+#include <linux/limits.h>
+#endif
+
static ProcessInvoker* g_this;
/* ------------------------------------------------------------------------ */
/* static functions */
/* ------------------------------------------------------------------------ */
static Sigfunc* setSignalHandler(int signo, Sigfunc* handler)
{
struct sigaction act,oact;
act.sa_handler = handler;
::sigemptyset(&act.sa_mask);
act.sa_flags = 0;
#ifdef SA_RESTART
act.sa_flags |= SA_RESTART;
#endif
if(::sigaction(signo, &act, &oact) < 0){
return(NULL);
}
return(oact.sa_handler);
}
static void childHandler(int /*signo*/)
{
pid_t pid;
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
@@ -29,49 +29,49 @@
#include <qpe/config.h>
using namespace Opie::Core;
using namespace Opie::Ui;
/* QT */
#include <qclipboard.h>
#include <qcolor.h>
#include <qcombobox.h>
#include <qdirectpainter_qws.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qfiledialog.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qpainter.h>
#include <qpushbutton.h>
#include <qtimer.h>
#include <qwhatsthis.h>
/* STD */
#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"
{
void BenchFFT( void );
double dhry_main( int );
}
#define DHRYSTONE_RUNS 20000000
#define TEST_DURATION 3
//===========================================================================
class BenchmarkPaintWidget : public QWidget
{
public:
BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
{
resize( QApplication::desktop()->size() );
show();
p.begin( this );
};