[Gnash-commit] gnash ChangeLog libbase/utility.cpp libbase/uti...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/28 11:31:56

Modified files:
        .              : ChangeLog 
        libbase        : utility.cpp utility.h 

Log message:
                * libbase/utility.{cpp,h} (dump_memory_stats): removed compiler
                  warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.748&r2=1.749
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -b -r1.748 -r1.749
--- ChangeLog   28 Aug 2006 11:14:20 -0000      1.748
+++ ChangeLog   28 Aug 2006 11:31:55 -0000      1.749
@@ -1,5 +1,7 @@
 2006-08-28 Sandro Santilli  <address@hidden>
 
+       * libbase/utility.{cpp,h} (dump_memory_stats): removed compiler
+         warning.
        * server/ActionExec.cpp, server/action.cpp, server/impl.cpp,
          server/sprite_instance.h: removed "stream.h" inclusion.
        * server/morph.cpp: log_msg -> log_parse, minor indentations

Index: libbase/utility.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libbase/utility.cpp 28 Aug 2006 11:07:14 -0000      1.10
+++ libbase/utility.cpp 28 Aug 2006 11:31:56 -0000      1.11
@@ -72,16 +72,19 @@
 // end of HAVE_DMALLOC
 #endif
 
-
-void dump_memory_stats(const char* from, int line, const char *label) 
-// Dump the internal statistics from malloc() so we can track memory leaks
-{
-
-  
 // This does not work with DMALLOC, since the internal data structures
 // differ.
 #ifdef HAVE_DMALLOC
 #ifdef HAVE_MALLINFO
+#define CAN_DUMP_MEMORY_STATS
+#endif
+#endif
+
+#ifndef CAN_DUMP_MEMORY_STATS
+void dump_memory_stats(const char*, int, const char *)  {}
+#else
+void dump_memory_stats(const char* from, int line, const char *label) 
+{
 
        static int allocated = 0;
        static int freeb = 0;
@@ -109,9 +112,8 @@
        //  allocated = mi.uordblks;
        //}  
 
-#endif // HAVE_DMALLOC
-#endif // HAVE_MALLINFO
 }
+#endif // CAN_DUMP_MEMORY_STATS
 
 // Local Variables:
 // mode: C++

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/utility.h   27 Aug 2006 18:28:37 -0000      1.7
+++ libbase/utility.h   28 Aug 2006 11:31:56 -0000      1.8
@@ -167,7 +167,7 @@
        return h;
 }
 
-// Dump the internal statistics from malloc() so we can track memory leaks
+/// Dump the internal statistics from malloc() so we can track memory leaks
 void dump_memory_stats(const char *from, int line, const char *label);
 
 #endif // UTILITY_H