[Gnash-commit] gnash libbase/utility.h ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/29 17:35:42

Modified files:
        libbase        : utility.h 
        .              : ChangeLog 

Log message:
                * libbase/utility.h: Use C ctyle cast for pthread_self() to work
                around BSD compiler bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6448&r2=1.6449

Patches:
Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- libbase/utility.h   29 Mar 2008 16:27:10 -0000      1.48
+++ libbase/utility.h   29 Apr 2008 17:35:42 -0000      1.49
@@ -241,7 +241,11 @@
 # ifdef __APPLE_CC__
     return reinterpret_cast<unsigned long int>(pthread_self());
 # else
-    return static_cast<unsigned long int>(pthread_self());
+    // This isn't a proper style C++ cast, but FreeBSD has a problem with
+    // static_cast for this as pthread_self() returns a pointer. We can
+    // use that too, this ID is only used for the log file to keep output
+    // from seperare threads clear.
+    return (unsigned long int)pthread_self();
 # endif 
 #else
 # ifdef _WIN32

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6448
retrieving revision 1.6449
diff -u -b -r1.6448 -r1.6449
--- ChangeLog   29 Apr 2008 17:22:42 -0000      1.6448
+++ ChangeLog   29 Apr 2008 17:35:42 -0000      1.6449
@@ -1,3 +1,8 @@
+2008-04-29  Rob Savoye  <address@hidden>
+
+       * libbase/utility.h: Use C ctyle cast for pthread_self() to work
+       around BSD compiler bug.
+       
 2008-04-29 Sandro Santilli <address@hidden>
 
        * server/edit_text_character.cpp: have wordWrap take precedence