cleanup

svn-id: r38712

8 files changed, 25 insertions, 25 deletions

diff --git a/engines/sci/include/sfx_player.h b/engines/sci/include/sfx_player.h
index efd2a2902d..7e3b7ea2f1 100644
--- a/engines/sci/include/sfx_player.h
+++ b/engines/sci/include/sfx_player.h
@@ -67,12 +67,12 @@ typedef struct {
 	** to add iterators onto their already existing iterators
 	*/
 
-	int (*fade_out)(void);
+	int (*fade_out)();
 	/* Fades out the currently playing song (within two seconds
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	*/
 
-	int (*stop)(void);
+	int (*stop)();
 	/* Stops the currently playing song and deletes the associated iterator
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	*/
@@ -86,22 +86,22 @@ typedef struct {
 	** and re-start playing, so it is preferred that it is present
 	*/
 
-	int (*pause)(void); /* OPTIONAL -- may be NULL */
+	int (*pause)(); /* OPTIONAL -- may be NULL */
 	/* Pauses song playing
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	*/
 
-	int (*resume)(void); /* OPTIONAL -- may be NULL */
+	int (*resume)(); /* OPTIONAL -- may be NULL */
 	/* Resumes song playing after a pause
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	*/
 
-	int (*exit)(void);
+	int (*exit)();
 	/* Stops the player
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	*/
 
-	void (*maintenance)(void); /* OPTIONAL -- may be NULL */
+	void (*maintenance)(); /* OPTIONAL -- may be NULL */
 	/* Regularly called maintenance function
 	** This function is called frequently and regularly (if present), it can be
 	** used to emit sound.
@@ -123,17 +123,17 @@ sfx_player_t *sfx_find_player(char *name);
 ** Returns   : (sfx_player_t *) The player requested, or NULL if none was found
 */
 
-tell_synth_func *sfx_get_player_tell_func(void);
+tell_synth_func *sfx_get_player_tell_func();
 /* Gets the callback function of the player in use.
 ** Returns:   (tell_synth_func *) The callback function.
 */
 
-int sfx_get_player_polyphony(void);
+int sfx_get_player_polyphony();
 /* Determines the polyphony of the player in use
 ** Returns   : (int) Number of voices the active player can emit
 */
 
-void sfx_reset_player(void);
+void sfx_reset_player();
 /* Tells the player to stop its internal iterator
 ** Parameters: None.
 ** Returns: Nothing.
diff --git a/engines/sci/include/sfx_timer.h b/engines/sci/include/sfx_timer.h
index 3f75777199..08120ffe57 100644
--- a/engines/sci/include/sfx_timer.h
+++ b/engines/sci/include/sfx_timer.h
@@ -43,7 +43,7 @@ typedef struct {
 	** This function is called exactly once (provided that the timer is used at all).
 	*/
 
-	int (*exit)(void);
+	int (*exit)();
 	/* Stops the timer
 	** Returns   : (int) SFX_OK on success, SFX_ERROR on failure
 	** All resources allocated with the timer should be freed as an effect
diff --git a/engines/sci/include/vm.h b/engines/sci/include/vm.h
index a6e169a1d6..6771e04c06 100644
--- a/engines/sci/include/vm.h
+++ b/engines/sci/include/vm.h
@@ -712,7 +712,7 @@ int game_exit(EngineState *s);
 ** This function should be run after each script_run() call.
 */
 
-void quit_vm(void);
+void quit_vm();
 /* Instructs the virtual machine to abort
 ** Paramteres: (void)
 ** Returns   : (void)
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp
index 66ad33a8e2..994063a8f9 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/scicore/tools.cpp
@@ -380,7 +380,7 @@ int sci_mkpath(const char *path) {
 #ifdef HAVE_SCHED_YIELD
 #  include <sched.h>
 
-void sci_sched_yield(void) {
+void sci_sched_yield() {
 	sched_yield();
 }
 
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 5c376aa3ff..5ff66716b3 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -57,19 +57,19 @@ int sfx_pcm_available() {
 	return (pcm_device != NULL);
 }
 
-void sfx_reset_player(void) {
+void sfx_reset_player() {
 	if (player)
 		player->stop();
 }
 
-tell_synth_func *sfx_get_player_tell_func(void) {
+tell_synth_func *sfx_get_player_tell_func() {
 	if (player)
 		return player->tell_synth;
 	else
 		return NULL;
 }
 
-int sfx_get_player_polyphony(void) {
+int sfx_get_player_polyphony() {
 	if (player)
 		return player->polyphony;
 	else
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 7690f686db..ab75c705e3 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -150,7 +150,7 @@ static sfx_pcm_feed_t pcmfeed = {
 /* API implementation */
 /*--------------------*/
 
-static void pp_timer_callback(void) {
+static void pp_timer_callback() {
 	/* Hey, we're polled anyway ;-) */
 }
 
@@ -229,12 +229,12 @@ static int pp_add_iterator(song_iterator_t *it, GTimeVal start_time) {
 	return SFX_OK;
 }
 
-static int pp_fade_out(void) {
+static int pp_fade_out() {
 	warning(__FILE__": Attempt to fade out- not implemented yet");
 	return SFX_ERROR;
 }
 
-static int pp_stop(void) {
+static int pp_stop() {
 	song_iterator_t *it = play_it;
 
 	play_it = NULL;
@@ -255,14 +255,14 @@ static int pp_send_iterator_message(song_iterator_message_t msg) {
 	return SFX_OK;
 }
 
-static int pp_pause(void) {
+static int pp_pause() {
 	play_paused = 1;
 	seq->set_volume(seq, 0);
 
 	return SFX_OK;
 }
 
-static int pp_resume(void) {
+static int pp_resume() {
 	if (!play_it) {
 		play_paused = 0;
 		return SFX_OK; /* Nothing to resume */
@@ -278,7 +278,7 @@ static int pp_resume(void) {
 	return SFX_OK;
 }
 
-static int pp_exit(void) {
+static int pp_exit() {
 	seq->exit(seq);
 	songit_free(play_it);
 	play_it = NULL;
diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h
index 1df126f926..072445f8ec 100644
--- a/engines/sci/sfx/sequencer.h
+++ b/engines/sci/sfx/sequencer.h
@@ -68,7 +68,7 @@ typedef struct _sfx_sequencer {
 	** data.
 	*/
 
-	int (*close)(void);
+	int (*close)();
 	/* Closes the sequencer
 	** Returns   : SFX_OK on success, SFX_ERROR otherwise
 	*/
@@ -97,7 +97,7 @@ typedef struct _sfx_sequencer {
 	** Returns   : SFX_OK on success, SFX_ERROR otherwise
 	*/
 
-	int (*allstop)(void); /* OPTIONAL -- may be NULL */
+	int (*allstop)(); /* OPTIONAL -- may be NULL */
 	/* Stops playing everything in the sequencer queue
 	** Returns   : SFX_OK on success, SFX_ERROR otherwise
 	*/
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index 3a607a3188..627659abd4 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -124,7 +124,7 @@ static guint8 adlib_master;
 
 
 /* initialise note/operator lists, etc. */
-void adlibemu_init_lists(void) {
+void adlibemu_init_lists() {
 	int i;
 
 	int j;
@@ -419,7 +419,7 @@ static void adlibemu_update_pitch(int chn, int note, int newpitch) {
 //  printf("Matched %d notes on channel %d.\n", matched, chn);
 }
 
-void test_adlib(void) {
+void test_adlib() {
 
 	int voice = 0;
 #if 0