citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #210 from lioncash/typedef 

system: Get rid of an unnecessary enum typedef
This commit is contained in:
Tony Wasserka 2014-11-18 16:54:37 +01:00
parent 9010b54a90 b37f91c617
commit ed4e599008
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/system.h
View File

@ -11,16 +11,16 @@
namespace System {
// State of the full emulator
typedef enum {
STATE_NULL = 0, ///< System is in null state, nothing initialized
STATE_IDLE, ///< System is in an initialized state, but not running
STATE_RUNNING, ///< System is running
STATE_LOADING, ///< System is loading a ROM
STATE_HALTED, ///< System is halted (error)
STATE_STALLED, ///< System is stalled (unused)
STATE_DEBUG, ///< System is in a special debug mode (unused)
STATE_DIE ///< System is shutting down
} State;
enum State {
STATE_NULL = 0, ///< System is in null state, nothing initialized
STATE_IDLE, ///< System is in an initialized state, but not running
STATE_RUNNING, ///< System is running
STATE_LOADING, ///< System is loading a ROM
STATE_HALTED, ///< System is halted (error)
STATE_STALLED, ///< System is stalled (unused)
STATE_DEBUG, ///< System is in a special debug mode (unused)
STATE_DIE ///< System is shutting down
};
extern volatile State g_state;