summaryrefslogtreecommitdiff
path: root/Dalos
diff options
context:
space:
mode:
authorpixel <pixel>2005-11-05 14:36:11 +0000
committerpixel <pixel>2005-11-05 14:36:11 +0000
commit003e130f79b5de2177381c8258080980b2cf85f5 (patch)
tree340909d5c5959c8ea31ec8c8bd0c0c2903263560 /Dalos
parent8871e4ca37ae147715dc957904686dd4add82d77 (diff)
Fixing Dalos a bit, and fixing DVD support.
Diffstat (limited to 'Dalos')
-rw-r--r--Dalos/Console.cc4
-rw-r--r--Dalos/Console.h6
-rw-r--r--Dalos/Hexview.cc4
-rw-r--r--Dalos/Hexview.h6
4 files changed, 14 insertions, 6 deletions
diff --git a/Dalos/Console.cc b/Dalos/Console.cc
index ac72b2f..5e2ffc2 100644
--- a/Dalos/Console.cc
+++ b/Dalos/Console.cc
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: Console.cc,v 1.4 2004-12-26 03:29:09 pixel Exp $ */
+/* $Id: Console.cc,v 1.5 2005-11-05 14:36:11 pixel Exp $ */
#include <SDL.h>
#include <SDL_thread.h>
@@ -309,3 +309,5 @@ void console::create_console_thread() {
SDL_CreateThread(ReadLineInternals::readline_thread, 0);
}
+
+console * CurrentConsole;
diff --git a/Dalos/Console.h b/Dalos/Console.h
index f7af59b..df66e09 100644
--- a/Dalos/Console.h
+++ b/Dalos/Console.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: Console.h,v 1.4 2004-12-26 03:29:10 pixel Exp $ */
+/* $Id: Console.h,v 1.5 2005-11-05 14:36:11 pixel Exp $ */
#ifndef __CONSOLE_H__
#define __CONSOLE_H__
@@ -51,7 +51,9 @@ class console : public mogltk::widget {
int nlines, page;
std::vector<String> lines;
SDL_mutex * protect_add_line;
-} * CurrentConsole;
+};
+
+extern console * CurrentConsole;
// We should rather have a special mechanism for these
extern SDL_mutex * console_lock;
diff --git a/Dalos/Hexview.cc b/Dalos/Hexview.cc
index 109aa3a..b5f43ae 100644
--- a/Dalos/Hexview.cc
+++ b/Dalos/Hexview.cc
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: Hexview.cc,v 1.3 2005-06-20 22:43:35 pixel Exp $ */
+/* $Id: Hexview.cc,v 1.4 2005-11-05 14:36:11 pixel Exp $ */
#include <SDL.h>
@@ -204,3 +204,5 @@ void hexview::resize_notify() {
nlines = Father()->GetH() / 13;
resize(Father()->GetW(), Father()->GetH());
}
+
+hexview * CurrentHexview; \ No newline at end of file
diff --git a/Dalos/Hexview.h b/Dalos/Hexview.h
index a550e04..ea7209c 100644
--- a/Dalos/Hexview.h
+++ b/Dalos/Hexview.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: Hexview.h,v 1.3 2005-06-20 22:43:35 pixel Exp $ */
+/* $Id: Hexview.h,v 1.4 2005-11-05 14:36:11 pixel Exp $ */
#ifndef __HEXVIEW_H__
#define __HEXVIEW_H__
@@ -55,6 +55,8 @@ class hexview : public mogltk::widget {
int offset_loaded, size_loaded, virtual_base;
int shift;
Uint8 * data;
-} * CurrentHexview;
+};
+
+extern hexview * CurrentHexview;
#endif