ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lint. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5716 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-16 00:58:34 +00:00
parent f8cf2aaa3e
commit 494ba1eba2
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/GLew/src/visualinfo.c vendored
View File

@ -86,12 +86,12 @@ char* display = NULL;
int visual = -1; int visual = -1;
FILE* file = 0; FILE* file = 0;
GLContext ctx;
int int
main (int argc, char** argv) main (int argc, char** argv)
{ {
GLenum err; GLenum err;
GLContext ctx;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* parse arguments */ /* parse arguments */

28
Externals/SDL/SConscript vendored
View File

@ -17,13 +17,13 @@ files = [
#'src/audio/SDL_wave.c', #'src/audio/SDL_wave.c',
#'src/cdrom/SDL_cdrom.c', #'src/cdrom/SDL_cdrom.c',
#'src/cpuinfo/SDL_cpuinfo.c', #'src/cpuinfo/SDL_cpuinfo.c',
'src/events/SDL_active.c', #'src/events/SDL_active.c',
'src/events/SDL_events.c', #'src/events/SDL_events.c',
'src/events/SDL_expose.c', #'src/events/SDL_expose.c',
'src/events/SDL_keyboard.c', #'src/events/SDL_keyboard.c',
'src/events/SDL_mouse.c', #'src/events/SDL_mouse.c',
'src/events/SDL_quit.c', #'src/events/SDL_quit.c',
'src/events/SDL_resize.c', #'src/events/SDL_resize.c',
#'src/file/SDL_rwops.c', #'src/file/SDL_rwops.c',
'src/joystick/SDL_joystick.c', 'src/joystick/SDL_joystick.c',
#'src/stdlib/SDL_getenv.c', #'src/stdlib/SDL_getenv.c',
@ -31,10 +31,8 @@ files = [
#'src/stdlib/SDL_malloc.c', #'src/stdlib/SDL_malloc.c',
#'src/stdlib/SDL_qsort.c', #'src/stdlib/SDL_qsort.c',
#'src/stdlib/SDL_stdlib.c', #'src/stdlib/SDL_stdlib.c',
'src/stdlib/SDL_string.c', #'src/thread/SDL_thread.c',
'src/thread/SDL_thread.c', #'src/timer/SDL_timer.c',
'src/timer/SDL_timer.c',
'src/timer/unix/SDL_systimer.c',
#'src/video/SDL_RLEaccel.c', #'src/video/SDL_RLEaccel.c',
#'src/video/SDL_blit.c', #'src/video/SDL_blit.c',
#'src/video/SDL_blit_0.c', #'src/video/SDL_blit_0.c',
@ -53,13 +51,6 @@ files = [
#'src/video/SDL_yuv_sw.c', #'src/video/SDL_yuv_sw.c',
] ]
files += [
'src/thread/generic/SDL_syscond.c',
'src/thread/generic/SDL_sysmutex.c',
'src/thread/generic/SDL_syssem.c',
'src/thread/generic/SDL_systhread.c',
]
if sys.platform == 'darwin': if sys.platform == 'darwin':
files += [ files += [
'src/joystick/darwin/SDL_sysjoystick.c', 'src/joystick/darwin/SDL_sysjoystick.c',
@ -67,6 +58,7 @@ if sys.platform == 'darwin':
elif sys.platform == 'linux2': elif sys.platform == 'linux2':
files += [ files += [
'src/joystick/linux/SDL_sysjoystick.c', 'src/joystick/linux/SDL_sysjoystick.c',
'src/stdlib/SDL_string.c',
] ]
else: else:
files += [ files += [

12
Externals/SDL/src/joystick/linux/SDL_sysjoystick.c vendored
View File

@ -500,25 +500,25 @@ int SDL_SYS_JoystickInit(void)
} }
/* Function to get the device-dependent name of a joystick */ /* Function to get the device-dependent name of a joystick */
const char *SDL_SYS_JoystickName(int index) const char *SDL_SYS_JoystickName(int jindex)
{ {
int fd; int fd;
static char namebuf[128]; static char namebuf[128];
char *name; char *name;
SDL_logical_joydecl(int oindex = index); SDL_logical_joydecl(int oindex = jindex);
#ifndef NO_LOGICAL_JOYSTICKS #ifndef NO_LOGICAL_JOYSTICKS
SDL_joylist_head(index, index); SDL_joylist_head(jindex, jindex);
#endif #endif
name = NULL; name = NULL;
fd = open(SDL_joylist[index].fname, O_RDONLY, 0); fd = open(SDL_joylist[jindex].fname, O_RDONLY, 0);
if ( fd >= 0 ) { if ( fd >= 0 ) {
if ( if (
#if SDL_INPUT_LINUXEV #if SDL_INPUT_LINUXEV
(ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) && (ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) &&
#endif #endif
(ioctl(fd, JSIOCGNAME(sizeof(namebuf)), namebuf) <= 0) ) { (ioctl(fd, JSIOCGNAME(sizeof(namebuf)), namebuf) <= 0) ) {
name = SDL_joylist[index].fname; name = SDL_joylist[jindex].fname;
} else { } else {
name = namebuf; name = namebuf;
} }
@ -526,7 +526,7 @@ const char *SDL_SYS_JoystickName(int index)
#ifndef NO_LOGICAL_JOYSTICKS #ifndef NO_LOGICAL_JOYSTICKS
if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || index!=oindex) if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || jindex!=oindex)
{ {
LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128); LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128);
} }