[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui riscos.cpp riscos_glue.h riscos_glue_...
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash/gui riscos.cpp riscos_glue.h riscos_glue_... |
Date: |
Tue, 28 Nov 2006 12:34:47 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/28 12:34:47
Modified files:
gui : riscos.cpp riscos_glue.h riscos_glue_agg.cpp
riscos_glue_agg.h riscossup.h
Log message:
RiscOS-patches merging.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos_glue.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos_glue_agg.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos_glue_agg.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscossup.h?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: riscos.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- riscos.cpp 28 Nov 2006 12:20:16 -0000 1.1
+++ riscos.cpp 28 Nov 2006 12:34:47 -0000 1.2
@@ -17,6 +17,8 @@
//
//
+/* $Id: riscos.cpp,v 1.2 2006/11/28 12:34:47 nihilus Exp $ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -25,7 +27,7 @@
//#include "movie_definition.h"
#include "gui.h"
#include "rc.h"
-#include "rosup.h"
+#include "riscossup.h"
#include "render_handler.h"
#include "log.h"
@@ -238,7 +240,7 @@
t = os_read_monotonic_time();
while (!_quit) {
- error = xwimp_poll_idle(0, &block, t, NULL, &event);
+ error = xwimp_poll_idle(wimp_SAVE_FP, &block, t, NULL, &event);
if (error) {
log_msg("%s\n", error->errmess);
return false;
Index: riscos_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos_glue.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- riscos_glue.h 28 Nov 2006 12:20:16 -0000 1.1
+++ riscos_glue.h 28 Nov 2006 12:34:47 -0000 1.2
@@ -17,6 +17,8 @@
//
//
+/* $Id: riscos_glue.h,v 1.2 2006/11/28 12:34:47 nihilus Exp $ */
+
#include "gnash.h"
namespace gnash
Index: riscos_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos_glue_agg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- riscos_glue_agg.cpp 28 Nov 2006 12:20:16 -0000 1.1
+++ riscos_glue_agg.cpp 28 Nov 2006 12:34:47 -0000 1.2
@@ -17,7 +17,7 @@
//
//
-/* $Id: riscos_glue_agg.cpp,v 1.1 2006/11/28 12:20:16 nihilus Exp $ */
+/* $Id: riscos_glue_agg.cpp,v 1.2 2006/11/28 12:34:47 nihilus Exp $ */
#include <cstdio>
#include <cerrno>
@@ -27,7 +27,7 @@
#include "log.h"
#include "render_handler.h"
#include "render_handler_agg.h"
-#include "ro_glue_agg.h"
+#include "riscos_glue_agg.h"
namespace gnash
{
@@ -158,7 +158,5 @@
}
#endif
-
-
} // namespace gnash
Index: riscos_glue_agg.h
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos_glue_agg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- riscos_glue_agg.h 28 Nov 2006 12:20:16 -0000 1.1
+++ riscos_glue_agg.h 28 Nov 2006 12:34:47 -0000 1.2
@@ -17,7 +17,9 @@
//
//
-#include "ro_glue.h"
+/* $Id: riscos_glue_agg.h,v 1.2 2006/11/28 12:34:47 nihilus Exp $ */
+
+#include "riscos_glue.h"
namespace gnash
{
Index: riscossup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/riscossup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- riscossup.h 28 Nov 2006 12:20:16 -0000 1.1
+++ riscossup.h 28 Nov 2006 12:34:47 -0000 1.2
@@ -1,3 +1,24 @@
+//
+// 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
+
+//
+//
+
+/* $Id: riscossup.h,v 1.2 2006/11/28 12:34:47 nihilus Exp $ */
+
#ifndef __ROSUP_H__
#define __ROSUP_H__
@@ -12,7 +33,7 @@
#include "oslib/wimp.h"
#ifdef RENDERER_AGG
-#include "ro_glue_agg.h"
+#include "riscos_glue_agg.h"
#endif
#include "gui.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/gui riscos.cpp riscos_glue.h riscos_glue_...,
Markus Gothe <=