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
@@ -106,98 +106,101 @@ int main ( int argc, char **argv )
                 else if ( child > 0 ) {
                         int status = 0;
                         time_t started = ::time ( 0 );
 
                         while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
 
                         LoginApplication::logout ( );
 
                         if (( ::time ( 0 ) - started ) < 3 ) {
                                 if ( autolog ) {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- disabling auto-login\n" );
                                         autolog = 0;
                                 }
                                 else {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- going down\n" );
                                         break;
                                 }
                         }
                         int killedbysig = 0;
             userExited=0;
             if (WIFEXITED(status)!=0 ) {
                 if (WEXITSTATUS(status)==137)  {
                     userExited=1;
                 }
             }
 
                         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 ) {
 
                 QWSServer::setDesktopBackground( QImage() );
                 ODevice::inst()->setDisplayStatus( true );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs( autolog );
 
 
                                 if ( LoginApplication::changeIdentity ( ))
                                         ::exit ( LoginApplication::login ( ));
                                 else
                                         ::exit ( 0 );
                         }
                         else  {
                                 ::exit ( login_main ( argc, argv, ppid ));
             }
                 }
         }
         return 0;
 }
 
 void sigterm ( int /*sig*/ )
 {
         ::exit ( 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,50 +1,54 @@
 #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;
         #ifdefSA_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;
         int status;
         while((pid = ::waitpid(-1, &status, WNOHANG)) > 0){
                 if(pid == g_this->m_child){
                         g_this->notifyFinish(status);
                 }
         }
 }
 
 /* ------------------------------------------------------------------------ */
         /*      ProcessInvoker Class : parent process                                                           */
 /* ------------------------------------------------------------------------ */
 ProcessInvoker::ProcessInvoker()
 {
         g_this = this;
         m_isRunning = false;
         m_child = 0;
         m_defChildHandler = SIG_DFL;
         m_pTimer = new QTimer(this);
         m_stdfd[0] = m_stdfd[1] = -1;
         m_errfd[0] = m_errfd[1] = -1;
         connect(m_pTimer, SIGNAL(timeout()),
                 this, SLOT(readOutputs()));
 }
 
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
@@ -5,97 +5,97 @@
 **
 ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
 ** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "benchmarkinfo.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/ostorageinfo.h>
 #include <opie2/olistview.h>
 #include <opie2/oresource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpedecoration_qws.h>
 #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 );
     };
 
     ~BenchmarkPaintWidget()
     {
         p.end();
         hide();
     };
 
     QPainter p;
 };
 
 //===========================================================================
 
 BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
         : QWidget( parent, name, wFlags )
 {
 
     setMinimumSize( 200, 150 );
 
     QVBoxLayout* vb = new QVBoxLayout( this );
     vb->setSpacing( 4 );
     vb->setMargin( 4 );
 
     tests = new OListView( this );
     QWhatsThis::add( tests->viewport(), tr( "This area shows the available tests, the results for which the tests "
                                 "have been performed, and comparison values for one selected device. "