[Gnash-commit] gnash ChangeLog server/matrix.cpp [gnash_0_8_3_branch]

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Bastiaan Jacques <bjacques>     08/05/24 21:40:32

Modified files:
        .              : ChangeLog 
        server         : matrix.cpp 

Log message:
        Use std::max instead of fmax, to fix build on BSD and friends.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.39&r2=1.6573.2.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.27&r2=1.27.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.39
retrieving revision 1.6573.2.40
diff -u -b -r1.6573.2.39 -r1.6573.2.40
--- ChangeLog   23 May 2008 16:55:45 -0000      1.6573.2.39
+++ ChangeLog   24 May 2008 21:40:31 -0000      1.6573.2.40
@@ -1,3 +1,8 @@
+2008-05-24 Bastiaan Jacques <address@hidden>
+
+       * server/matrix.cpp: Use std::max instead of fmax, to fix build on BSD
+       and friends.
+
 2008-05-23 Russ Nelson <address@hidden>
 
        * configure.ac: make the user's life a little easier by telling them

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -b -r1.27 -r1.27.2.1
--- server/matrix.cpp   12 Mar 2008 03:46:03 -0000      1.27
+++ server/matrix.cpp   24 May 2008 21:40:32 -0000      1.27.2.1
@@ -400,7 +400,7 @@
        //float basis1_length2 = m_[1][0] * m_[1][0] + m_[1][1] * m_[1][1];
        float   basis1_length2 = m_[0][1] * m_[0][1] + m_[1][1] * m_[1][1];
 
-       float   max_length2 = fmax(basis0_length2, basis1_length2);
+       float   max_length2 = std::max(basis0_length2, basis1_length2);
        return sqrtf(max_length2);
 }