[Gnash-commit] gnash configure.ac libbase/utility.h server/aso...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/08/29 22:20:10

Modified files:
        .              : configure.ac 
        libbase        : utility.h 
        server/asobj   : Date.cpp 
        backend        : render_handler_agg.cpp 

Log message:
        Uniforming trunc() and check in libm if it already exists.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.409&r2=1.410
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.103&r2=1.104

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -b -r1.409 -r1.410
--- configure.ac        29 Aug 2007 17:34:06 -0000      1.409
+++ configure.ac        29 Aug 2007 22:20:10 -0000      1.410
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.409 2007/08/29 17:34:06 udog Exp $
+dnl $Id: configure.ac,v 1.410 2007/08/29 22:20:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -789,6 +789,7 @@
 
 AC_CHECK_LIB(m, exp2, AC_DEFINE(HAVE_EXP2, 1, [Has exp2()]))
 AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
+AC_CHECK_LIB(m, trunc, AC_DEFINE(HAVE_TRUNC, 1, [Has trunc()]))
 
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o 
x$build_sdl = xyes; then

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libbase/utility.h   29 Aug 2007 02:49:17 -0000      1.31
+++ libbase/utility.h   29 Aug 2007 22:20:10 -0000      1.32
@@ -118,7 +118,9 @@
 inline double  exp2(double x) { return std::pow((double)2, double(x)); }
 #endif
 inline int     frnd(float f) { return (int)(f + 0.5f); }       // replace with 
inline asm if desired
-
+#ifndef HAVE_TRUNC
+inline double trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
+#endif
 
 // Handy macro to quiet compiler warnings about unused parameters/variables.
 #define UNUSED(x) (x) = (x)

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/Date.cpp       1 Jul 2007 10:54:27 -0000       1.47
+++ server/asobj/Date.cpp       29 Aug 2007 22:20:10 -0000      1.48
@@ -79,6 +79,7 @@
 #endif
 
 #include "log.h"
+#include "utility.h"
 #include "Date.h"
 #include "fn_call.h"
 #include "GnashException.h"
@@ -94,10 +95,6 @@
 # include <sys/time.h>
 #endif
 
-#ifndef trunc
-#define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
-#endif
-
 
 // Declaration for replacement timezone functions
 // In the absence of gettimeofday() we use ftime() to get milliseconds,

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- backend/render_handler_agg.cpp      29 Aug 2007 17:34:06 -0000      1.103
+++ backend/render_handler_agg.cpp      29 Aug 2007 22:20:10 -0000      1.104
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.103 2007/08/29 17:34:06 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.104 2007/08/29 22:20:10 nihilus Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -174,10 +174,6 @@
 #include "render_handler_agg_bitmap.h"
 #include "render_handler_agg_style.h"
 
-#ifndef trunc
-#define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
-#endif
-
 #ifndef round
 #define round(x) rint(x)
 #endif