[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[628] mplayerxp

[<nic...@us...>]

Revision: 628
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=628&view=rev
Author:   nickols_k
Date:     2013-04-17 09:54:29 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
fixed compilation with gcc-4.8.0

Modified Paths:
--------------
    mplayerxp/configure
    mplayerxp/osdep/mp_malloc.cpp
    mplayerxp/osdep/mplib.h

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2013-04-12 07:48:43 UTC (rev 627)
+++ mplayerxp/configure	2013-04-17 09:54:29 UTC (rev 628)
@@ -644,7 +644,7 @@
 fi
 
 if enabled png; then
-require2 png png.h PNG_LIBPNG_VER_STRING -lpng
+require3 png png.h Z_BEST_SPEED PNG_LIBPNG_VER_STRING -lpng
 print_config HAVE_ mpxp_config.h mpxp_config.mak png
 disabled png	&& require2 libpng_png libpng/png.h PNG_LIBPNG_VER_STRING -lpng -lm
 print_config HAVE_ mpxp_config.h mpxp_config.mak libpng_png

Modified: mplayerxp/osdep/mp_malloc.cpp
===================================================================
--- mplayerxp/osdep/mp_malloc.cpp	2013-04-12 07:48:43 UTC (rev 627)
+++ mplayerxp/osdep/mp_malloc.cpp	2013-04-17 09:54:29 UTC (rev 628)
@@ -570,13 +570,13 @@
     mp_free(ptr);
 }
 
-any_t *operator new(size_t size) { return SECURE_NAME0(_mp_malloc)(size); }
-any_t *operator new(size_t size,const zeromemory_t&) { return SECURE_NAME1(_mp_mallocz)(size); }
-any_t *operator new(size_t size,const alignedmemory_t&,size_t boundary) { return SECURE_NAME2(_mp_memalign)(boundary,size); }
-any_t *operator new(size_t size,const std::nothrow_t&) { return mp_malloc(size); }
-any_t *operator new[](size_t size) { return SECURE_NAME0(_mp_malloc)(size); }
-any_t *operator new[](size_t size,const zeromemory_t&) { return SECURE_NAME1(_mp_mallocz)(size); }
-any_t *operator new[](size_t size,const alignedmemory_t&,size_t boundary) { return SECURE_NAME2(_mp_memalign)(boundary,size); }
-any_t *operator new[](size_t size,const std::nothrow_t&) { return mp_malloc(size); }
-void   operator delete(any_t* p) { SECURE_NAME3(_mp_free)(p); }
-void   operator delete[](any_t* p) { SECURE_NAME3(_mp_free)(p); }
+any_t* operator new(size_t size) throw(std::bad_alloc) { return SECURE_NAME0(_mp_malloc)(size); }
+any_t* operator new(size_t size,const zeromemory_t&) { return SECURE_NAME1(_mp_mallocz)(size); }
+any_t* operator new(size_t size,const alignedmemory_t&,size_t boundary) { return SECURE_NAME2(_mp_memalign)(boundary,size); }
+any_t* operator new(size_t size,const std::nothrow_t&) { return mp_malloc(size); }
+any_t* operator new[](size_t size) throw(std::bad_alloc) { return SECURE_NAME0(_mp_malloc)(size); }
+any_t* operator new[](size_t size,const zeromemory_t&) { return SECURE_NAME1(_mp_mallocz)(size); }
+any_t* operator new[](size_t size,const alignedmemory_t&,size_t boundary) { return SECURE_NAME2(_mp_memalign)(boundary,size); }
+any_t* operator new[](size_t size,const std::nothrow_t&) { return mp_malloc(size); }
+void   operator delete(any_t* p) throw() { SECURE_NAME3(_mp_free)(p); }
+void   operator delete[](any_t* p) throw() { SECURE_NAME3(_mp_free)(p); }

Modified: mplayerxp/osdep/mplib.h
===================================================================
--- mplayerxp/osdep/mplib.h	2013-04-12 07:48:43 UTC (rev 627)
+++ mplayerxp/osdep/mplib.h	2013-04-17 09:54:29 UTC (rev 628)
@@ -108,14 +108,14 @@
 #include <new>
 enum zeromemory_t{ zeromem=0 };
 enum alignedmemory_t{ alignmem=0 };
-any_t *operator new(size_t size);
-any_t *operator new(size_t size,const zeromemory_t&);
-any_t *operator new(size_t size,const alignedmemory_t&,size_t boundary);
-any_t *operator new(size_t size,const std::nothrow_t&);
-any_t *operator new[](size_t size);
-any_t *operator new[](size_t size,const zeromemory_t&);
-any_t *operator new[](size_t size,const alignedmemory_t&,size_t boundary);
-any_t *operator new[](size_t size,const std::nothrow_t&);
+any_t* operator new(size_t size);
+any_t* operator new(size_t size,const zeromemory_t&);
+any_t* operator new(size_t size,const alignedmemory_t&,size_t boundary);
+any_t* operator new(size_t size,const std::nothrow_t&);
+any_t* operator new[](size_t size);
+any_t* operator new[](size_t size,const zeromemory_t&);
+any_t* operator new[](size_t size,const alignedmemory_t&,size_t boundary);
+any_t* operator new[](size_t size,const std::nothrow_t&);
 void   operator delete(any_t* p);
 void   operator delete[](any_t* p);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.