[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    [PATCH] kspread --enable-final compile fix
From:       Yenar Calentaure <yenar () host ! sk>
Date:       2002-11-10 16:22:59
[Download RAW message or body]

Hello!

[please CC me as i am not subscribed to koffice-devel]

This patch fixed compile failure with --enable-final in kspread for me. 
It is against yesterdays cvsup. Please review/commit. Thanks.

yenar

-- 
-----------------------------------------------------------------------
inetname: Yenar Calentaure
realname: Peter Rockai
     mail: yenar(at)host.sk
homepage: http://yenar.host.sk
-----------------------------------------------------------------------
The universe is entering maintenance mode in 2 minutes. Please logout.
                                      -- Your administrator
-----------------------------------------------------------------------

["00-kspread-enable-final.diff" (text/plain)]

diff -uNr ./_koffice.orig/kspread/kspread_functions_database.cc \
                ./_koffice.new/kspread/kspread_functions_database.cc
--- ./_koffice.orig/kspread/kspread_functions_database.cc	Sat Nov  2 16:36:47 2002
+++ ./_koffice.new/kspread/kspread_functions_database.cc	Sun Nov 10 10:16:22 2002
@@ -34,6 +34,7 @@
 #include <kspread_cell.h>
 #include <kspread_doc.h>
 #include <kspread_functions.h>
+#include <kspread_functions_helper.h>
 #include <kspread_map.h>
 #include <kspread_table.h>
 #include <kspread_util.h>
@@ -100,7 +101,7 @@
  * values. Idea for this kind of solution taken from Openoffice.
  *
  *********************************************************************/
-
+/*
 static bool approx_equal (double a, double b)
 {
   if ( a == b )
@@ -108,7 +109,7 @@
   double x = a - b;
   return (x < 0.0 ? -x : x)  <  ((a < 0.0 ? -a : a) * DBL_EPSILON);
 }
-
+*/
 void getCond( KSpreadDB::Condition & cond, QString text )
 {
   cond.comp = KSpreadDB::isEqual;
diff -uNr ./_koffice.orig/kspread/kspread_functions_helper.h \
                ./_koffice.new/kspread/kspread_functions_helper.h
--- ./_koffice.orig/kspread/kspread_functions_helper.h	Sun Oct 20 10:14:56 2002
+++ ./_koffice.new/kspread/kspread_functions_helper.h	Sun Nov 10 10:12:10 2002
@@ -19,6 +19,8 @@
 */
 
 // helper functions for other functions
+#ifndef __kspread_functions_helper__
+#define __kspread_functions_helper__
 
 #include <koscript_parser.h>
 #include <koscript_util.h>
@@ -84,4 +86,4 @@
                                   double & result, double avera, bool aMode );
 
 
-
+#endif /* __kspread_functions_helper__ */


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel

[prev in list] [next in list] [prev in thread] [next in thread]