diff options
| author | 2011-08-14 23:01:08 +0000 | |
|---|---|---|
| committer | 2011-08-14 23:01:08 +0000 | |
| commit | fd97e3da4c89f40439845ddcaec72052db0a3110 (patch) | |
| tree | 97e4c3daad5a8d55dbdcb483353195f4112c7e58 /src/osd | |
| parent | 074bc495974a7587609aa2acb8dbe8e10dcf9c82 (diff) | |
Clean-ups and version bumpmame0143u3
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/sdl/sdlmain.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/d3dhlsl.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/drawd3d.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/winfile.c | 10 | ||||
| -rw-r--r-- | src/osd/windows/winfile.h | 2 | ||||
| -rw-r--r-- | src/osd/windows/winmain.c | 6 | ||||
| -rw-r--r-- | src/osd/windows/winsocket.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/winwork.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index 0816850a7e9..97075e47b07 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -583,7 +583,7 @@ void sdl_osd_interface::init(running_machine &machine) /* Set the SDL environment variable for drivers wanting to load the * lib at startup. */ -#if USE_OPENGL +#if USE_OPENGL /* FIXME: move lib loading code from drawogl.c here */ stemp = options.gl_lib(); diff --git a/src/osd/windows/d3dhlsl.c b/src/osd/windows/d3dhlsl.c index 1d60f430dad..b24d38c8b99 100644 --- a/src/osd/windows/d3dhlsl.c +++ b/src/osd/windows/d3dhlsl.c @@ -1160,7 +1160,7 @@ void hlsl_info::init_effect_info(d3d_poly_info *poly) // This is extremely slow, but we're not rendering models here, // just post-processing. curr_effect = post_effect; - + (*d3dintf->effect.set_float)(curr_effect, "ScanlineOffset", (poly->texture->cur_frame == 0) ? 0.0f : options->scanline_offset); if(options->params_dirty) diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c index 336e19dd40c..fd494f8560c 100644 --- a/src/osd/windows/drawd3d.c +++ b/src/osd/windows/drawd3d.c @@ -503,7 +503,7 @@ static void drawd3d_window_destroy(win_window_info *window) // skip if nothing if (d3d == NULL) return; - + if (d3d->hlsl->recording()) d3d->hlsl->window_record(); diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c index 25165d476b3..90e48e4018e 100644 --- a/src/osd/windows/winfile.c +++ b/src/osd/windows/winfile.c @@ -102,7 +102,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 filerr = FILERR_OUT_OF_MEMORY; goto error; } - + if (win_check_socket_path(path)) { (*file)->type = WINFILE_SOCKET; @@ -111,7 +111,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 } (*file)->type = WINFILE_FILE; - + // convert the path into something Windows compatible dst = (*file)->filename; for (src = t_path; *src != 0; src++) @@ -214,7 +214,7 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length, case WINFILE_SOCKET: return win_read_socket(file, buffer, offset, length, actual); break; - + } return FILERR_NONE; } @@ -250,7 +250,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l case WINFILE_SOCKET: return win_write_socket(file, buffer, offset, length, actual); break; - + } return FILERR_NONE; } @@ -273,7 +273,7 @@ file_error osd_close(osd_file *file) return win_close_socket(file); break; } - return FILERR_NONE; + return FILERR_NONE; } diff --git a/src/osd/windows/winfile.h b/src/osd/windows/winfile.h index 502059fd616..82cbc886ed1 100644 --- a/src/osd/windows/winfile.h +++ b/src/osd/windows/winfile.h @@ -45,4 +45,4 @@ file_error win_close_socket(osd_file *file); file_error win_error_to_mame_file_error(DWORD error); -#endif //__WINFILE__
\ No newline at end of file +#endif //__WINFILE__ diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index ac77a688cc5..dfa1ad5d73c 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -682,8 +682,8 @@ void windows_osd_interface::init(running_machine &machine) } // initialize sockets - win_init_sockets(); - + win_init_sockets(); + // note the existence of a machine g_current_machine = &machine; } @@ -700,7 +700,7 @@ void windows_osd_interface::osd_exit(running_machine &machine) // cleanup sockets win_cleanup_sockets(); - + // take down the watchdog thread if it exists if (watchdog_thread != NULL) { diff --git a/src/osd/windows/winsocket.c b/src/osd/windows/winsocket.c index 2b132a69b0b..c82f21cf102 100644 --- a/src/osd/windows/winsocket.c +++ b/src/osd/windows/winsocket.c @@ -23,7 +23,7 @@ const char *winfile_socket_identifier = "socket."; -bool win_init_sockets() +bool win_init_sockets() { WSADATA wsaData; WORD version; diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c index 816c0246d6d..d900904c1f9 100644 --- a/src/osd/windows/winwork.c +++ b/src/osd/windows/winwork.c @@ -494,7 +494,7 @@ void osd_work_queue_free(osd_work_queue *queue) // free the list if (queue->thread != NULL) free(queue->thread); - + scalable_lock_delete(&queue->lock); // free all the events |
