[Gnash-commit] gnash ChangeLog server/Makefile.am server/asobj...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/24 13:37:22

Modified files:
        .              : ChangeLog 
        server         : Makefile.am 
        server/asobj   : Makefile.am 
Added files:
        server/asobj   : Global.h 
Removed files:
        server         : Global.h 

Log message:
                * server/Global.h = server/asobj/Global.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1741&r2=1.1742
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Global.h?cvsroot=gnash&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.h?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -b -r1.1741 -r1.1742
--- ChangeLog   24 Nov 2006 13:33:20 -0000      1.1741
+++ ChangeLog   24 Nov 2006 13:37:22 -0000      1.1742
@@ -1,5 +1,6 @@
 2006-11-24 Sandro Santilli <address@hidden>
 
+       * server/Global.h = server/asobj/Global.h
        * server/as_object.{cpp,h}: off-lined constructors and
          destructor, with constructor asserting the presence
          of an unitialized VM; made set_prototype() a protected member

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/Makefile.am  24 Nov 2006 09:19:50 -0000      1.90
+++ server/Makefile.am  24 Nov 2006 13:37:22 -0000      1.91
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.90 2006/11/24 09:19:50 strk Exp $
+# $Id: Makefile.am,v 1.91 2006/11/24 13:37:22 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -88,7 +88,6 @@
 
 noinst_HEADERS = \
        GetterSetter.h \
-       Global.h \
        Property.h \
        PropertyList.h \
        Sprite.h \

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/Makefile.am    24 Nov 2006 09:19:50 -0000      1.20
+++ server/asobj/Makefile.am    24 Nov 2006 13:37:22 -0000      1.21
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.20 2006/11/24 09:19:50 strk Exp $
+# $Id: Makefile.am,v 1.21 2006/11/24 13:37:22 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -87,6 +87,7 @@
        Date.h          \
        Error.h         \
        GMath.h         \
+       Global.h        \
        Key.h           \
        LoadVars.h      \
        LocalConnection.h\

Index: server/asobj/Global.h
===================================================================
RCS file: server/asobj/Global.h
diff -N server/asobj/Global.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ server/asobj/Global.h       24 Nov 2006 13:37:22 -0000      1.1
@@ -0,0 +1,39 @@
+// 
+//   Copyright (C) 2005, 2006 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+// Implementation of the Global ActionScript Object
+
+#ifndef GNASH_GLOBAL_H
+#define GNASH_GLOBAL_H
+
+#include "as_object.h" // for inheritance
+
+namespace gnash {
+
+void as_global_trace(const fn_call& fn);
+
+class Global: public as_object
+{
+public:
+       Global();
+       ~Global() {}
+};
+
+} // namespace gnash
+
+#endif // ndef GNASH_GLOBAL_H

Index: server/Global.h
===================================================================
RCS file: server/Global.h
diff -N server/Global.h
--- server/Global.h     8 May 2006 11:43:58 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-// Implementation of the Global ActionScript Object
-
-#ifndef GNASH_GLOBAL_H
-#define GNASH_GLOBAL_H
-
-#include "as_object.h" // for inheritance
-
-namespace gnash {
-
-void as_global_trace(const fn_call& fn);
-
-class Global: public as_object
-{
-public:
-       Global();
-       ~Global() {}
-};
-
-} // namespace gnash
-
-#endif // ndef GNASH_GLOBAL_H