[Gnash-commit] gnash ChangeLog server/asobj/Global.cpp server/...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/01/09 15:14:20

Modified files:
        .              : ChangeLog 
        server/asobj   : Global.cpp Makefile.am xml.cpp xml.h 
                         xmlattrs.cpp xmlattrs.h xmlnode.cpp xmlnode.h 
                         xmlsocket.cpp xmlsocket.h 

Log message:
                * server/asobj/Global.cpp: Always add XML support. Include
                config.h.
                * server/asobj/xml.cpp, xml.h, xmlattrs.h, xmlattrs.cpp,
                xmlnode.h, xmlnode.cpp, xmlsocket.h, xmlsocket.cpp: Don't make
                building XML optional, it's part of the Flash spec.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2063&r2=1.2064
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlattrs.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlattrs.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2063
retrieving revision 1.2064
diff -u -b -r1.2063 -r1.2064
--- ChangeLog   9 Jan 2007 14:22:32 -0000       1.2063
+++ ChangeLog   9 Jan 2007 15:14:20 -0000       1.2064
@@ -1,3 +1,11 @@
+2007-01-09  Rob Savoye  <address@hidden>
+
+       * server/asobj/Global.cpp: Always add XML support. Include
+       config.h.
+       * server/asobj/xml.cpp, xml.h, xmlattrs.h, xmlattrs.cpp,
+       xmlnode.h, xmlnode.cpp, xmlsocket.h, xmlsocket.cpp: Don't make
+       building XML optional, it's part of the Flash spec.
+       
 2007-01-08  Rob Savoye  <address@hidden>
 
        * Makefile.am: Change ZLIB_ to Z_, so it works with

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/Global.cpp     17 Dec 2006 20:24:58 -0000      1.26
+++ server/asobj/Global.cpp     9 Jan 2007 15:14:20 -0000       1.27
@@ -18,7 +18,11 @@
 
 // Implementation of the Global ActionScript Object
 
-/* $Id: Global.cpp,v 1.26 2006/12/17 20:24:58 rsavoye Exp $ */
+/* $Id: Global.cpp,v 1.27 2007/01/09 15:14:20 rsavoye Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "as_object.h"
 #include "as_prop_flags.h"
@@ -59,10 +63,8 @@
 #include <fn_call.h>
 #include <sprite_instance.h>
 
-#ifdef HAVE_LIBXML
 #include "xml.h"
 #include "xmlsocket.h"
-#endif
 
 using namespace std;
 
@@ -404,11 +406,9 @@
        set_member("Sound", as_value(sound_new));
 
        set_member("TextFormat", as_value(textformat_new));
-#ifdef HAVE_LIBXML
        set_member("XML", as_value(xml_new));
        set_member("XMLNode", as_value(xmlnode_new));
        set_member("XMLSocket", as_value(xmlsocket_new));
-#endif // HAVE_LIBXML
 
        // This next set are all the unimplemented classes whose
        // code was machine generated.

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/Makefile.am    19 Dec 2006 11:07:41 -0000      1.27
+++ server/asobj/Makefile.am    9 Jan 2007 15:14:20 -0000       1.28
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.27 2006/12/19 11:07:41 strk Exp $
+# $Id: Makefile.am,v 1.28 2007/01/09 15:14:20 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/xml.cpp        21 Dec 2006 14:12:00 -0000      1.3
+++ server/asobj/xml.cpp        9 Jan 2007 15:14:20 -0000       1.4
@@ -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: xml.cpp,v 1.3 2006/12/21 14:12:00 strk Exp $ */
+/* $Id: xml.cpp,v 1.4 2007/01/09 15:14:20 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,7 +30,6 @@
 #include "as_function.h" // for as_function
 #include "fn_call.h"
 
-#ifdef HAVE_LIBXML
 
 #include <unistd.h>
 #include "xmlattrs.h"
@@ -1321,10 +1316,6 @@
 
 } // end of gnash namespace
 
-// HAVE_LIBXML
-#endif
-
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xml.h  24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xml.h  9 Jan 2007 15:14:20 -0000       1.2
@@ -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 __XML_H__
 #define __XML_H__
 
@@ -33,8 +29,6 @@
 //#define DEBUG_MEMORY_ALLOCATION 1
 #include <vector>
 
-#ifdef HAVE_LIBXML
-
 #include "xmlattrs.h"
 #include "xmlnode.h"
 
@@ -254,9 +248,6 @@
 
 }      // end namespace gnash
 
-
-#endif // HAVE_LIBXML
-
 #endif // __XML_H__
 
 

Index: server/asobj/xmlattrs.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlattrs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlattrs.cpp   24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlattrs.cpp   9 Jan 2007 15:14:20 -0000       1.2
@@ -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: xmlattrs.cpp,v 1.1 2006/11/24 09:19:50 strk Exp $ */
+/* $Id: xmlattrs.cpp,v 1.2 2007/01/09 15:14:20 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,8 +29,6 @@
 #include "tu_config.h"
 #include "as_function.h"
 
-#ifdef HAVE_LIBXML
-
 #include "xmlattrs.h"
 
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -80,9 +74,6 @@
 
 } // end of gnash namespace
 
-// HAVE_LIBXML
-#endif
-
 
 // Local Variables:
 // mode: C++

Index: server/asobj/xmlattrs.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlattrs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlattrs.h     24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlattrs.h     9 Jan 2007 15:14:20 -0000       1.2
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBXML
-
 #include "tu_config.h"
 
 //#define DEBUG_MEMORY_ALLOCATION 1
@@ -91,8 +89,6 @@
  
 } // end of gnash namespace
 
-#endif // HAVE_LIBXML
-
 #endif // __XML_ATTRS_H__
 
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlnode.cpp    24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlnode.cpp    9 Jan 2007 15:14:20 -0000       1.2
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: xmlnode.cpp,v 1.1 2006/11/24 09:19:50 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.2 2007/01/09 15:14:20 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,8 +30,6 @@
 #include "tu_config.h"
 #include "fn_call.h"
 
-#ifdef HAVE_LIBXML
-
 //#define DEBUG_MEMORY_ALLOCATION 1
 
 #include "xmlnode.h"
@@ -439,10 +437,6 @@
 
 } // end of gnash namespace
 
-// HAVE_LIBXML
-#endif
-
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlnode.h      24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlnode.h      9 Jan 2007 15:14:20 -0000       1.2
@@ -32,8 +32,6 @@
 #include "action.h"
 #include "impl.h"
 
-#ifdef HAVE_LIBXML
-
 #include "xmlattrs.h"
 
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -156,8 +154,6 @@
 } // end of gnash namespace
 
 
-#endif // HAVE_LIBXML
-
 #endif // __XMLNODE_NODE_H__
 
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlsocket.cpp  24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlsocket.cpp  9 Jan 2007 15:14:20 -0000       1.2
@@ -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
 
-// 
-//
-//
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,8 +26,6 @@
 #include "fn_call.h"
 #include "sprite_instance.h"
 
-#ifdef HAVE_LIBXML
-
 #include "log.h"
 
 #include <sys/types.h>
@@ -807,5 +801,3 @@
 
 } // end of gnaash namespace
 
-// HAVE_LIBXML
-#endif

Index: server/asobj/xmlsocket.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/xmlsocket.h    24 Nov 2006 09:19:50 -0000      1.1
+++ server/asobj/xmlsocket.h    9 Jan 2007 15:14:20 -0000       1.2
@@ -31,8 +31,6 @@
 
 #include <string>
 
-#ifdef HAVE_LIBXML
-
 namespace gnash {
 
 extern const int SOCKET_DATA;
@@ -111,8 +109,6 @@
  
 } // end of gnash namespace
 
-// HAVE_LIBXML
-#endif
 
 // __XMLSOCKETSOCKET_H__
 #endif