[Gnash-commit] gnash server/gnash.h ChangeLog libamf/Makefile....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/14 13:36:08

Modified files:
        server         : gnash.h 
        .              : ChangeLog 
        libamf         : Makefile.am amf.cpp amf.h 

Log message:
                * server/gnash.h: Include memory for auto_ptr.
                * libamf/amf.h: Include cstring for C string functions.
                * libamf/amf.cpp: Use lower case for win32 headers, as that's 
what
                Mingw32 uses.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3195&r2=1.3196
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/gnash.h      23 Apr 2007 16:40:08 -0000      1.95
+++ server/gnash.h      14 May 2007 13:36:07 -0000      1.96
@@ -14,11 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
-/* $Id: gnash.h,v 1.95 2007/04/23 16:40:08 strk Exp $ */
-
 /// \mainpage
 ///
 ///  See Related Pages for movies and sprites informations
@@ -33,6 +28,7 @@
 
 #include "tu_config.h"
 
+#include <memory> // for auto_ptr
 #include <cctype>      // for poxy wchar_t
 #include <cstdarg>     // for va_list arg to 
sprite_instance::call_method_args()
 #include <string>      // for movie_definition* 
create_movie(std::auto_ptr<tu_file> in, const std::string& url);

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3195
retrieving revision 1.3196
diff -u -b -r1.3195 -r1.3196
--- ChangeLog   14 May 2007 13:17:32 -0000      1.3195
+++ ChangeLog   14 May 2007 13:36:07 -0000      1.3196
@@ -1,3 +1,10 @@
+2007-05-14  Rob Savoye  <address@hidden>
+
+       * server/gnash.h: Include memory for auto_ptr.
+       * libamf/amf.h: Include cstring for C string functions.
+       * libamf/amf.cpp: Use lower case for win32 headers, as that's what
+       Mingw32 uses.
+       
 2007-05-14 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/displaylist_depths_test7.c: fix description

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libamf/Makefile.am  3 May 2007 23:05:08 -0000       1.24
+++ libamf/Makefile.am  14 May 2007 13:36:08 -0000      1.25
@@ -15,16 +15,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.24 2007/05/03 23:05:08 nihilus Exp $
+# $Id: Makefile.am,v 1.25 2007/05/14 13:36:08 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
-AM_LDFLAGS = \
-       $(top_builddir)/libbase/libgnashbase.la
-
 lib_LTLIBRARIES = libgnashamf.la
 libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
-libgnashamf_la_LDFLAGS =  -release $(VERSION) -export-dynamic -no-undefined 
${AM_LDFLAGS} 
+
+libgnashamf_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la
+libgnashamf_la_LDFLAGS =  -release $(VERSION) ${AM_LDFLAGS} 
 # noinst_HEADERS = amf.h amfutf8.h
 
 AM_CPPFLAGS = -I.. -I$(srcdir) \

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- libamf/amf.cpp      14 May 2007 09:44:21 -0000      1.37
+++ libamf/amf.cpp      14 May 2007 13:36:08 -0000      1.38
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.37 2007/05/14 09:44:21 jgilmore Exp $ */
+/* $Id: amf.cpp,v 1.38 2007/05/14 13:36:08 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,7 +28,7 @@
 #include <vector>
 
 #if defined(_WIN32) || defined(WIN32)
-#      include <Winsock2.h>
+#      include <winsock2.h>
 #else
 #      include <netinet/in.h>
 #endif

Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libamf/amf.h        30 Apr 2007 17:24:14 -0000      1.18
+++ libamf/amf.h        14 May 2007 13:36:08 -0000      1.19
@@ -23,6 +23,7 @@
 
 #include <vector>
 #include <string>
+#include <cstring>
 #include <map>
 
 #include "amfutf8.h"