diff -ru glaunch.orig/common.mk glaunch/common.mk --- glaunch.orig/common.mk 2002-05-14 21:28:18.000000000 -0700 +++ glaunch/common.mk 2003-09-24 16:22:28.000000000 -0700 @@ -3,8 +3,8 @@ # Uncomment one target #TARGET = DJGPP -TARGET = MINGW -#TARGET = UNIX +#TARGET = MINGW +TARGET = UNIX # To disable feature, set to zero (0) USE_TTF = 1 diff -ru glaunch.orig/control/gl_key.cc glaunch/control/gl_key.cc --- glaunch.orig/control/gl_key.cc 2003-09-24 16:20:24.000000000 -0700 +++ glaunch/control/gl_key.cc 2003-09-24 16:22:28.000000000 -0700 @@ -2,6 +2,8 @@ #include "gl_key.h" #include "allegro.h" +using namespace std; + typedef map GlKeyMap; static GlKeyMap * glToAllegroMap = 0; diff -ru glaunch.orig/engine/engine.cc glaunch/engine/engine.cc --- glaunch.orig/engine/engine.cc 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/engine/engine.cc 2003-09-24 16:22:28.000000000 -0700 @@ -1,3 +1,4 @@ +#define ALLEGRO_WITH_OSSDIGI #include #include #include diff -ru glaunch.orig/include/mamescan.h glaunch/include/mamescan.h --- glaunch.orig/include/mamescan.h 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/include/mamescan.h 2003-09-24 16:24:24.000000000 -0700 @@ -1,12 +1,15 @@ #ifndef _ENGINE_H_ #define _ENGINE_H_ +#include #include #include #include namespace MameScan { + using namespace std; + typedef enum { GOOD, PRELIMINARY } GameStatus; class Exception diff -ru glaunch.orig/include/outline.h glaunch/include/outline.h --- glaunch.orig/include/outline.h 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/include/outline.h 2003-09-24 16:22:28.000000000 -0700 @@ -9,6 +9,7 @@ */ namespace Outline { + using namespace std; /** * Calculates the height of the font taking into account the extra * padding of the outline. diff -ru glaunch.orig/mamescan/options.h glaunch/mamescan/options.h --- glaunch.orig/mamescan/options.h 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/mamescan/options.h 2003-09-24 16:22:28.000000000 -0700 @@ -4,6 +4,8 @@ #include "getopt.h" #include +using namespace std; + // This is a singleton class class Options diff -ru glaunch.orig/model/emulator.cc glaunch/model/emulator.cc --- glaunch.orig/model/emulator.cc 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/model/emulator.cc 2003-09-24 16:22:28.000000000 -0700 @@ -2,8 +2,8 @@ #include #include -#include "fileutil.h" #include "glaunch.h" +#include "fileutil.h" #include "logfile.h" using namespace GameLauncher; @@ -63,7 +63,7 @@ Emulator::Emulator(const string & config_name, const string & path_prefix, - Emulator_Listener * listener = 0 + Emulator_Listener * listener ) throw (InvalidEmulatorConfig) : p_name_map(), p_games() { @@ -612,7 +612,7 @@ } InvalidEmulator::InvalidEmulator(const string & config_name, - Emulator_Listener * listener = 0) + Emulator_Listener * listener) : Emulator() { if (listener != 0) diff -ru glaunch.orig/model/emumgr.cc glaunch/model/emumgr.cc --- glaunch.orig/model/emumgr.cc 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/model/emumgr.cc 2003-09-24 16:22:28.000000000 -0700 @@ -1,6 +1,6 @@ +#include "glaunch.h" #include "logfile.h" #include "fileutil.h" -#include "glaunch.h" using namespace GameLauncher; using namespace std; diff -ru glaunch.orig/model/game.cc glaunch/model/game.cc --- glaunch.orig/model/game.cc 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/model/game.cc 2003-09-24 16:22:28.000000000 -0700 @@ -1,5 +1,5 @@ -#include "logfile.h" #include "glaunch.h" +#include "logfile.h" using namespace GameLauncher; using namespace std; diff -ru glaunch.orig/startup/unix/glaunch.cc glaunch/startup/unix/glaunch.cc --- glaunch.orig/startup/unix/glaunch.cc 2003-09-24 16:20:25.000000000 -0700 +++ glaunch/startup/unix/glaunch.cc 2003-09-24 16:22:28.000000000 -0700 @@ -5,6 +5,8 @@ #include "exit.h" #include +using namespace std; + static int runProgram(const char * program); int main(int argc, char *argv[]) diff -ru glaunch.orig/view/movebmp.cc glaunch/view/movebmp.cc --- glaunch.orig/view/movebmp.cc 2003-09-24 16:20:26.000000000 -0700 +++ glaunch/view/movebmp.cc 2003-09-24 16:22:28.000000000 -0700 @@ -132,7 +132,7 @@ } void -Movable_Bitmap::move_to(int x, int y, int milliseconds = 0) +Movable_Bitmap::move_to(int x, int y, int milliseconds) { fix num_game_ticks; diff -ru glaunch.orig/view/movetext.cc glaunch/view/movetext.cc --- glaunch.orig/view/movetext.cc 2003-09-24 16:20:26.000000000 -0700 +++ glaunch/view/movetext.cc 2003-09-24 16:22:28.000000000 -0700 @@ -54,7 +54,7 @@ } void -Text_VC::set_contents(const string & text, BITMAP * icon = 0) +Text_VC::set_contents(const string & text, BITMAP * icon) { char * end; int max_width; diff -ru glaunch.orig/view/mp3bg.cc glaunch/view/mp3bg.cc --- glaunch.orig/view/mp3bg.cc 2003-09-24 16:20:26.000000000 -0700 +++ glaunch/view/mp3bg.cc 2003-09-24 16:22:28.000000000 -0700 @@ -195,7 +195,7 @@ } void -MP3_Background_Almp3_File::seek(unsigned index, int position = 0) +MP3_Background_Almp3_File::seek(unsigned index, int position) { bool was_running; @@ -457,7 +457,7 @@ } void -MP3_Background_Almp3_Stream::seek(unsigned index, int position = 0) +MP3_Background_Almp3_Stream::seek(unsigned index, int position) { bool was_running; diff -ru glaunch.orig/view/sshot.cc glaunch/view/sshot.cc --- glaunch.orig/view/sshot.cc 2003-09-24 16:20:26.000000000 -0700 +++ glaunch/view/sshot.cc 2003-09-24 16:22:28.000000000 -0700 @@ -101,7 +101,7 @@ void Screen_Shot::set_bitmap(const string & bitmap_file, fix brightness_percentage, - int delay = 0) + int delay) { p_new_bitmap_file = bitmap_file; p_brightness_percentage = brightness_percentage;