From 125ecc8cf4ce1c1fc2bafd8087a2f34315bde6c6 Mon Sep 17 00:00:00 2001 From: riccardom Date: Sun, 13 Jun 2010 15:08:57 +0000 Subject: [PATCH] configured_features is a class and not a struct. --- desmume/src/cli/main.cpp | 6 +++--- desmume/src/gtk/main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp index 0a6abf5c9..07db608ab 100644 --- a/desmume/src/cli/main.cpp +++ b/desmume/src/cli/main.cpp @@ -143,7 +143,7 @@ public: }; static void -init_config( struct configured_features *config) { +init_config( class configured_features *config) { config->auto_pause = 0; config->frameskip = 0; @@ -163,7 +163,7 @@ init_config( struct configured_features *config) { static int -fill_config( struct configured_features *config, +fill_config( class configured_features *config, int argc, char ** argv) { GOptionEntry options[] = { { "auto-pause", 0, 0, G_OPTION_ARG_NONE, &config->auto_pause, "Pause emulation if focus is lost", NULL}, @@ -506,7 +506,7 @@ static void desmume_cycle(struct ctrls_event_config * cfg) } int main(int argc, char ** argv) { - struct configured_features my_config; + class configured_features my_config; struct ctrls_event_config ctrls_cfg; #ifdef GDB_STUB gdbstub_handle_t arm9_gdb_stub; diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index cb481eb8a..a95d9d7a0 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -438,7 +438,7 @@ public: }; static void -init_configured_features( struct configured_features *config) +init_configured_features( class configured_features *config) { config->engine_3d = 1; @@ -453,7 +453,7 @@ init_configured_features( struct configured_features *config) } static int -fill_configured_features( struct configured_features *config, +fill_configured_features( class configured_features *config, int argc, char ** argv) { GOptionEntry options[] = { @@ -2006,7 +2006,7 @@ static gboolean timeout_exit_cb(gpointer data) static int -common_gtk_main( struct configured_features *my_config) +common_gtk_main( class configured_features *my_config) { driver = new GtkDriver();