more cpp cleanups

This commit is contained in:
zeromus 2008-09-08 08:18:16 +00:00
parent a30d1d9a67
commit fa04607aa5
2 changed files with 11 additions and 11 deletions

View File

@ -22,10 +22,10 @@
#include "ctrlssdl.h" #include "ctrlssdl.h"
const char *key_names[NB_KEYS];
u16 keyboard_cfg[NB_KEYS]; u16 keyboard_cfg[NB_KEYS];
u16 joypad_cfg[NB_KEYS]; u16 joypad_cfg[NB_KEYS];
u16 nbr_joy; u16 nbr_joy;
mouse_status mouse;
static SDL_Joystick **open_joysticks = NULL; static SDL_Joystick **open_joysticks = NULL;

View File

@ -22,31 +22,30 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifdef __cplusplus
#define EXTERNC extern "C"
#else
#define EXTERNC
#endif
typedef void *gdbstub_handle_t; typedef void *gdbstub_handle_t;
/* /*
* The function interface * The function interface
*/ */
gdbstub_handle_t EXTERNC gdbstub_handle_t
createStub_gdb( u16 port, createStub_gdb( u16 port,
struct armcpu_memory_iface **cpu_memio, struct armcpu_memory_iface **cpu_memio,
struct armcpu_memory_iface *direct_memio); struct armcpu_memory_iface *direct_memio);
void EXTERNC void
destroyStub_gdb( gdbstub_handle_t stub); destroyStub_gdb( gdbstub_handle_t stub);
void EXTERNC void
activateStub_gdb( gdbstub_handle_t stub, activateStub_gdb( gdbstub_handle_t stub,
struct armcpu_ctrl_iface *cpu_ctrl); struct armcpu_ctrl_iface *cpu_ctrl);
#ifdef __cplusplus
#define EXTERNC extern "C"
#else
#define EXTERNC
#endif
/* /*
* An implementation of the following functions is required * An implementation of the following functions is required
* for the GDB stub to function. * for the GDB stub to function.
@ -59,3 +58,4 @@ EXTERNC void
joinThread_gdb( void *thread_handle); joinThread_gdb( void *thread_handle);
#endif /* End of _GDBSTUB_H_ */ #endif /* End of _GDBSTUB_H_ */