[Gnash-commit] gnash ChangeLog libamf/amftest.cpp libbase/log....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/01/30 02:02:29

Modified files:
        .              : ChangeLog 
        libamf         : amftest.cpp 
        libbase        : log.h log.cpp 
        server/vm      : action.cpp 
        server/asobj   : xmlsocket.h 
        utilities      : parser.cpp processor.cpp 

Log message:
                * configure.ac: Remove --disable option. Bug #18905:
                * libamf/amftest.cpp:  Remove HAVE_LIBXML ifdefs, we always
                want XML support.
                * libbase/log.h, log.cpp: Remove HAVE_LIBXML ifdefs, we always
                want XML support.
                * server/asobj/xmlsocket.h: Remove HAVE_LIBXML ifdefs, we always
                want XML support.
                * server/vm/action.cpp: Remove HAVE_LIBXML ifdefs, we always 
want
                XML support.
                * utilities/parser.cpp, processor.cpp: Remove HAVE_LIBXML 
ifdefs,
                we always want XML support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2190&r2=1.2191
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amftest.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2190
retrieving revision 1.2191
diff -u -b -r1.2190 -r1.2191
--- ChangeLog   29 Jan 2007 23:21:01 -0000      1.2190
+++ ChangeLog   30 Jan 2007 02:02:28 -0000      1.2191
@@ -1,3 +1,17 @@
+2007-01-29  Rob Savoye  <address@hidden>
+
+       * configure.ac: Remove --disable option. Bug #18905:
+       * libamf/amftest.cpp:  Remove HAVE_LIBXML ifdefs, we always
+       want XML support.
+       * libbase/log.h, log.cpp: Remove HAVE_LIBXML ifdefs, we always
+       want XML support.
+       * server/asobj/xmlsocket.h: Remove HAVE_LIBXML ifdefs, we always
+       want XML support.
+       * server/vm/action.cpp: Remove HAVE_LIBXML ifdefs, we always want
+       XML support.
+       * utilities/parser.cpp, processor.cpp: Remove HAVE_LIBXML ifdefs,
+       we always want XML support.
+
 2007-01-25 Martin Guy <address@hidden>
 
        * configure.ac, README: Remove code and documentation for

Index: libamf/amftest.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amftest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libamf/amftest.cpp  29 Oct 2006 18:34:18 -0000      1.8
+++ libamf/amftest.cpp  30 Jan 2007 02:02:28 -0000      1.9
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,9 +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
 
-// 
-//
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,6 +22,7 @@
 
 #include <netinet/in.h>
 #include <string>
+#include <sys/types.h>
 
 #include "dejagnu.h"
 
@@ -40,13 +38,11 @@
                                // can optimize it's own performance
                                // when needed,
 
-#ifdef HAVE_LIBXML
 extern int xml_fd;             // FIXME: this is the file descriptor
                                // from XMLSocket::connect(). This
                                // needs to be propogated up through
                                // the layers properly, but first I
                                // want to make sure it all works.
-#endif // HAVE_LIBXML
 
 #include "amf.h"
 

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- libbase/log.h       8 Jan 2007 17:24:39 -0000       1.40
+++ libbase/log.h       30 Jan 2007 02:02:28 -0000      1.41
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,10 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
-/* $Id: log.h,v 1.40 2007/01/08 17:24:39 strk Exp $ */
+/* $Id: log.h,v 1.41 2007/01/30 02:02:28 rsavoye Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -96,9 +93,7 @@
     LogFile& operator << (const char *);
     LogFile& operator << (unsigned char const *);
     LogFile& operator << (const std::string &s);
-// #ifdef HAVE_LIBXML
 //     LogFile& operator << (const xmlChar *c);
-// #endif
     LogFile& operator << (std::ostream & (&)(std::ostream &));
 
     /// Print anything that can be printed on a stringstream

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- libbase/log.cpp     8 Jan 2007 17:24:39 -0000       1.41
+++ libbase/log.cpp     30 Jan 2007 02:02:28 -0000      1.42
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,11 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-//
-
-/* $Id: log.cpp,v 1.41 2007/01/08 17:24:39 strk Exp $ */
+/* $Id: log.cpp,v 1.42 2007/01/30 02:02:28 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,11 +34,9 @@
 # include <unistd.h>
 #endif
 
-#ifdef HAVE_LIBXML
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
-#endif
 #include <ctime>
 #define BOOST_HAS_THREADS 1
 
@@ -684,7 +678,7 @@
     return *this;
 }
 
-#ifdef HAVE_LIBXML_XX
+#if 0
 /// \brief print an XML char *
 LogFile& 
 LogFile::operator << (const xmlChar *c)

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/vm/action.cpp        23 Jan 2007 17:26:08 -0000      1.6
+++ server/vm/action.cpp        30 Jan 2007 02:02:29 -0000      1.7
@@ -14,8 +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
 
-//
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -43,11 +41,8 @@
 #include "fn_call.h"
 #include "VM.h"
 #include "StringPredicates.h"
-
-#ifdef HAVE_LIBXML
 #include "xml.h"
 #include "xmlsocket.h"
-#endif
 
 
 #include <typeinfo> 

Index: server/asobj/xmlsocket.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/xmlsocket.h    9 Jan 2007 15:14:20 -0000       1.2
+++ server/asobj/xmlsocket.h    30 Jan 2007 02:02:29 -0000      1.3
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,10 +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
 
-// 
-//
-//
-
 #ifndef __XMLSOCKET_H__
 #define __XMLSOCKET_H__
 

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- utilities/parser.cpp        10 Jan 2007 17:28:50 -0000      1.33
+++ utilities/parser.cpp        30 Jan 2007 02:02:29 -0000      1.34
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,9 +14,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
-//
 
-/* $Id: parser.cpp,v 1.33 2007/01/10 17:28:50 strk Exp $ */
+/* $Id: parser.cpp,v 1.34 2007/01/30 02:02:29 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,14 +61,11 @@
                                // can optimize it's own performance
                                // when needed,
 
-#ifdef HAVE_LIBXML
 extern int xml_fd;             // FIXME: this is the file descriptor
                                // from XMLSocket::connect(). This
                                // needs to be propogated up through
                                // the layers properly, but first I
                                // want to make sure it all works.
-#endif // HAVE_LIBXML
-
 
 using gnash::stream;
 using gnash::log_msg;

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- utilities/processor.cpp     2 Jan 2007 22:04:36 -0000       1.45
+++ utilities/processor.cpp     30 Jan 2007 02:02:29 -0000      1.46
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,10 +14,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
-//
-//
 
-/* $Id: processor.cpp,v 1.45 2007/01/02 22:04:36 nihilus Exp $ */
+/* $Id: processor.cpp,v 1.46 2007/01/30 02:02:29 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -67,13 +65,11 @@
                                // can optimize it's own performance
                                // when needed,
 
-#ifdef HAVE_LIBXML
 extern int xml_fd;             // FIXME: this is the file descriptor
                                // from XMLSocket::connect(). This
                                // needs to be propogated up through
                                // the layers properly, but first I
                                // want to make sure it all works.
-#endif // HAVE_LIBXML
 
 const char *GPROC_VERSION = "1.0";