diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-06-08 03:17:06 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-06-08 03:17:06 +0200 |
| commit | b79482af4451fa1018d6fcabdbe36f6e81ddeb3d (patch) | |
| tree | 3c744c2cd7fb17da01a393be329ff8f219a73426 | |
| parent | 103d9008d6e55e6e6c35a9859f88b7e5657af6ce (diff) | |
| parent | efdcfe404fcde6d479e8e7f347e22a53c41f3930 (diff) | |
Merge pull request #459 from lioncash/prototype-typo
Fix a typo in a function prototype in PowerPCDisasm.h
| -rw-r--r-- | Externals/Bochs_disasm/PowerPCDisasm.h | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/RegisterWindow.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Externals/Bochs_disasm/PowerPCDisasm.h b/Externals/Bochs_disasm/PowerPCDisasm.h index 539f171079..d78186af94 100644 --- a/Externals/Bochs_disasm/PowerPCDisasm.h +++ b/Externals/Bochs_disasm/PowerPCDisasm.h @@ -22,7 +22,8 @@ #ifndef _POWERPC_DISASM #define _POWERPC_DISASM -void DisassembleGekko(unsigned int opcode, unsigned int curInstAddr, char *dest, int max_size); -const char *GetGRPName(unsigned int index); +void DisassembleGekko(unsigned int opcode, unsigned int curInstAddr, char* dest, int max_size); +const char* GetGPRName(unsigned int index); +const char* GetFPRName(unsigned int index); #endif diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp index b34883ea32..f385bf20d0 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.cpp @@ -16,8 +16,6 @@ class wxWindow; -extern const char* GetGRPName(unsigned int index); - BEGIN_EVENT_TABLE(CRegisterWindow, wxPanel) END_EVENT_TABLE() |