This patch is for package: kdeutils-3.0.3 Main purpose is updating the kde sources for mips-sgi-irix Comments mhertha@hartmann-hertha.de *** kdeutils-3.0.3/ark/ark_part.cpp Tue Aug 27 08:18:41 2002 --- kdeutils-3.0.3/ark/ark_part.cpp.ORG Tue Aug 27 08:15:58 2002 *************** *** 26,34 **** #include #include - #ifdef __sgi - using namespace KParts; - #endif #include "arkwidgetpart.h" --- 26,31 ---- *** kdeutils-3.0.3/ark/arkwidget.cpp Tue Aug 27 08:37:38 2002 --- kdeutils-3.0.3/ark/arkwidget.cpp.ORG Tue Aug 27 08:29:42 2002 *************** *** 74,80 **** #elif defined(__sun) #include #define STATFS statvfs ! #elif defined(_AIX) || defined(__sgi) #include #endif --- 74,80 ---- #elif defined(__sun) #include #define STATFS statvfs ! #elif defined(_AIX) #include #endif *************** *** 130,146 **** { fprintf(stderr, "Size: %ld\n", size); struct STATFS buf; - #ifdef __sgi - if (STATFS(QFile::encodeName(dir), &buf, NULL, NULL) == 0) - #else if (STATFS(QFile::encodeName(dir), &buf) == 0) - #endif { - #ifdef __sgi - double nAvailable = (double)buf.f_bfree * buf.f_bsize; - #else double nAvailable = (double)buf.f_bavail * buf.f_bsize; - #endif if (nAvailable < (double)size) { KMessageBox::error(0, i18n("You have run out of disk space.")); --- 130,138 ---- *** kdeutils-3.0.3/kdf/disklist.h Tue Aug 27 18:23:15 2002 --- kdeutils-3.0.3/kdf/disklist.h.ORG Tue Aug 27 18:18:24 2002 *************** *** 42,53 **** #define NO_FS_TYPE false #else #define DF_ARGS "-k" - #ifdef __sgi - /* sgi has fs_type field, 2002-08-27: mhertha@hartmann-hertha.de */ - #define NO_FS_TYPE false - #else #define NO_FS_TYPE true - #endif #endif #ifdef _OS_SOLARIS_ --- 42,48 ---- *** kdeutils-3.0.3/kcalc/kcalc_core.cpp Tue Aug 27 09:08:58 2002 --- kdeutils-3.0.3/kcalc/kcalc_core.cpp.ORG Tue Aug 27 08:59:29 2002 *************** *** 380,399 **** if (DISPLAY_AMOUNT < 0) DISPLAY_AMOUNT = decimal_point ? DISPLAY_AMOUNT - ((CALCAMNT)data / - #ifdef __sgi - POW(float(current_base), decimal_point++)) : - #else POW(current_base, decimal_point++)) : - #endif (current_base * DISPLAY_AMOUNT) - data; else DISPLAY_AMOUNT = decimal_point ? DISPLAY_AMOUNT + ((CALCAMNT)data / - #ifdef __sgi - POW(float(current_base), decimal_point++)) : - #else POW(current_base, decimal_point++)) : - #endif (current_base * DISPLAY_AMOUNT) + data; if (decimal_point) --- 380,391 ---- *************** *** 425,437 **** else { --decimal_point; - #ifdef __sgi - DISPLAY_AMOUNT = floor(DISPLAY_AMOUNT * POW(float(current_base), decimal_point - 1)) / - POW(float(current_base), (decimal_point - 1)); - #else DISPLAY_AMOUNT = floor(DISPLAY_AMOUNT * POW(current_base, decimal_point - 1)) / POW(current_base, (decimal_point - 1)); - #endif } } else --- 417,424 ---- *************** *** 1350,1360 **** } else { - #ifdef __sgi - DISPLAY_AMOUNT = POW(float(10), int(DISPLAY_AMOUNT)); - #else DISPLAY_AMOUNT = POW(10, DISPLAY_AMOUNT); - #endif inverse = false; } break; --- 1337,1343 ---- *************** *** 2162,2178 **** return 1L; if (left_op < 0 && isoddint(1 / right_op)) - #ifdef __sgi - left_op = -1L * POW(float(-1L * left_op), int(right_op)); - #else left_op = -1L * POW((-1L * left_op), right_op); - #endif else - #ifdef __sgi - left_op = POW(float(left_op), int(right_op)); - #else left_op = POW(left_op, right_op); - #endif if (errno == EDOM || errno == ERANGE) { --- 2145,2153 ---- *************** *** 2196,2212 **** } if (left_op < 0 && isoddint(right_op)) - #ifdef __sgi - left_op = -1L * POW(float(-1L * left_op), float((1L)/right_op)); - #else left_op = -1L * POW((-1L * left_op), (1L)/right_op); - #endif else - #ifdef __sgi - left_op = POW(float(left_op), float((1L)/right_op)); - #else left_op = POW(left_op, (1L)/right_op); - #endif if (errno == EDOM || errno == ERANGE) { --- 2171,2179 ---- *** kdeutils-3.0.3/kcalc/kcalc.cpp Tue Aug 27 08:51:44 2002 --- kdeutils-3.0.3/kcalc/kcalc.cpp.ORG Tue Aug 27 08:47:54 2002 *************** *** 67,77 **** #include "version.h" // Initalize static members - #ifdef __sgi - const CALCAMNT QtCalculator::pi = (ASIN(double(1L)) * 2L); - #else const CALCAMNT QtCalculator::pi = (ASIN(1L) * 2L); ! #endif static const char *description = I18N_NOOP("KDE Calculator"); static const char *version = KCALCVERSION; --- 67,74 ---- #include "version.h" // Initalize static members const CALCAMNT QtCalculator::pi = (ASIN(1L) * 2L); ! static const char *description = I18N_NOOP("KDE Calculator"); static const char *version = KCALCVERSION;