--- a/src/ai/ai.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/ai/ai.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -166,7 +166,7 @@
  * The gameloop for AIs.
  *  Handles one tick for all the AIs.
  */
-void AI_RunGameLoop(void)
+void AI_RunGameLoop()
 {
 	/* Don't do anything if ai is disabled */
 	if (!_ai.enabled) return;
@@ -224,7 +224,7 @@
 /**
  * Initialize some AI-related stuff.
  */
-void AI_Initialize(void)
+void AI_Initialize()
 {
 	/* First, make sure all AIs are DEAD! */
 	AI_Uninitialize();
@@ -238,7 +238,7 @@
 /**
  * Deinitializer for AI-related stuff.
  */
-void AI_Uninitialize(void)
+void AI_Uninitialize()
 {
 	const Player* p;
 

--- a/src/ai/ai.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/ai/ai.h	Wed Mar 07 11:47:46 2007 +0000
@@ -40,9 +40,9 @@
 // ai.c
 void AI_StartNewAI(PlayerID player);
 void AI_PlayerDied(PlayerID player);
-void AI_RunGameLoop(void);
-void AI_Initialize(void);
-void AI_Uninitialize(void);
+void AI_RunGameLoop();
+void AI_Initialize();
+void AI_Uninitialize();
 int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
 int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback);
 
@@ -50,7 +50,7 @@
  * This function checks some boundries to see if we should launch a new AI.
  * @return True if we can start a new AI.
  */
-static inline bool AI_AllowNewAI(void)
+static inline bool AI_AllowNewAI()
 {
 	/* If disabled, no AI */
 	if (!_ai.enabled)
@@ -97,7 +97,7 @@
 /**
  * The random-function that should be used by ALL AIs.
  */
-static inline uint32 AI_Random(void)
+static inline uint32 AI_Random()
 {
 /* We pick RandomRange if we are in SP (so when saved, we do the same over and over)
 	 *   but we pick InteractiveRandomRange if we are a network_server or network-client.

--- a/src/ai/default/default.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/ai/default/default.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -453,12 +453,12 @@
 	void *to;
 } FoundRoute;
 
-static Town *AiFindRandomTown(void)
+static Town *AiFindRandomTown()
 {
 	return GetRandomTown();
 }
 
-static Industry *AiFindRandomIndustry(void)
+static Industry *AiFindRandomIndustry()
 {
 	return GetRandomIndustry();
 }

--- a/src/aircraft_cmd.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/aircraft_cmd.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -724,7 +724,7 @@
 	InvalidateWindowClasses(WC_AIRCRAFT_LIST);
 }
 
-void AircraftYearlyLoop(void)
+void AircraftYearlyLoop()
 {
 	Vehicle *v;
 
@@ -2104,7 +2104,7 @@
 
 
 /** need to be called to load aircraft from old version */
-void UpdateOldAircraft(void)
+void UpdateOldAircraft()
 {
 	/* set airport_flags to 0 for all airports just to be sure */
 	Station *st;

--- a/src/airport.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/airport.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -32,7 +32,7 @@
 static AirportFTAClass *HeliStation;
 
 
-void InitializeAirports(void)
+void InitializeAirports()
 {
 	CountryAirport = new AirportFTAClass(
 		_airport_moving_data_country,
@@ -175,7 +175,7 @@
 	);
 }
 
-void UnInitializeAirports(void)
+void UnInitializeAirports()
 {
 	delete CountryAirport;
 	delete CityAirport;
@@ -467,7 +467,7 @@
 }
 
 
-uint32 GetValidAirports(void)
+uint32 GetValidAirports()
 {
 	uint32 mask = 0;
 

--- a/src/airport.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/airport.h	Wed Mar 07 11:47:46 2007 +0000
@@ -181,8 +181,8 @@
 	byte heading;            // heading (current orders), guiding an airplane to its target on an airport
 } AirportFTA;
 
-void InitializeAirports(void);
-void UnInitializeAirports(void);
+void InitializeAirports();
+void UnInitializeAirports();
 const AirportFTAClass *GetAirport(const byte airport_type);
 
 /** Get buildable airport bitmask.
@@ -190,6 +190,6 @@
  * Bit 0 means the small airport is buildable, etc.
  * @todo set availability of airports by year, instead of airplane
  */
-uint32 GetValidAirports(void);
+uint32 GetValidAirports();
 
 #endif /* AIRPORT_H */

--- a/src/airport_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/airport_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -21,7 +21,7 @@
 
 static byte _selected_airport_type;
 
-static void ShowBuildAirportPicker(void);
+static void ShowBuildAirportPicker();
 
 
 void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
@@ -132,7 +132,7 @@
 	BuildAirToolbWndProc
 };
 
-void ShowBuildAirToolbar(void)
+void ShowBuildAirToolbar()
 {
 	if (!IsValidPlayer(_current_player)) return;
 
@@ -256,12 +256,12 @@
 	BuildAirportPickerWndProc
 };
 
-static void ShowBuildAirportPicker(void)
+static void ShowBuildAirportPicker()
 {
 	AllocateWindowDesc(&_build_airport_desc);
 }
 
-void InitializeAirportGui(void)
+void InitializeAirportGui()
 {
 	_selected_airport_type = AT_SMALL;
 }

--- a/src/autoreplace_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/autoreplace_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -30,7 +30,7 @@
 };
 
 /* General Vehicle GUI based procedures that are independent of vehicle types */
-void InitializeVehiclesGuiList(void)
+void InitializeVehiclesGuiList()
 {
 	_railtype_selected_in_replace_gui = RAILTYPE_RAIL;
 }

--- a/src/clear_cmd.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/clear_cmd.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -718,7 +718,7 @@
 	MarkTileDirtyByTile(tile);
 }
 
-void GenerateClearTile(void)
+void GenerateClearTile()
 {
 	uint i, gi;
 	TileIndex tile;
@@ -792,7 +792,7 @@
 	return;
 }
 
-void InitializeClearLand(void)
+void InitializeClearLand()
 {
 	_opt.snow_line = _patches.snow_line_height * TILE_HEIGHT;
 }

--- a/src/command.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/command.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -395,7 +395,7 @@
 	return res;
 }
 
-int32 GetAvailableMoneyForCommand(void)
+int32 GetAvailableMoneyForCommand()
 {
 	PlayerID pid = _current_player;
 	if (!IsValidPlayer(pid)) return 0x7FFFFFFF; // max int

--- a/src/command.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/command.h	Wed Mar 07 11:47:46 2007 +0000
@@ -209,6 +209,6 @@
 
 bool IsValidCommand(uint cmd);
 byte GetCommandFlags(uint cmd);
-int32 GetAvailableMoneyForCommand(void);
+int32 GetAvailableMoneyForCommand();
 
 #endif /* COMMAND_H */

--- a/src/console.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/console.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -46,7 +46,7 @@
  *  end of header  *
  * *************** */
 
-static void IConsoleClearCommand(void)
+static void IConsoleClearCommand()
 {
 	memset(_iconsole_cmdline.buf, 0, ICON_CMDLN_SIZE);
 	_iconsole_cmdline.length = 0;
@@ -56,7 +56,7 @@
 	SetWindowDirty(FindWindowById(WC_CONSOLE, 0));
 }
 
-static inline void IConsoleResetHistoryPos(void) {_iconsole_historypos = ICON_HISTORY_SIZE - 1;}
+static inline void IConsoleResetHistoryPos() {_iconsole_historypos = ICON_HISTORY_SIZE - 1;}
 
 
 static void IConsoleHistoryAdd(const char *cmd);
@@ -207,7 +207,7 @@
 	IConsoleWndProc,
 };
 
-void IConsoleInit(void)
+void IConsoleInit()
 {
 	extern const char _openttd_revision[];
 	_iconsole_output_file = NULL;
@@ -238,7 +238,7 @@
 	IConsoleHistoryAdd("");
 }
 
-void IConsoleClearBuffer(void)
+void IConsoleClearBuffer()
 {
 	uint i;
 	for (i = 0; i <= ICON_BUFFER; i++) {
@@ -247,7 +247,7 @@
 	}
 }
 
-static void IConsoleClear(void)
+static void IConsoleClear()
 {
 	free(_iconsole_cmdline.buf);
 	IConsoleClearBuffer();
@@ -262,7 +262,7 @@
 	}
 }
 
-bool CloseConsoleLogIfActive(void)
+bool CloseConsoleLogIfActive()
 {
 	if (_iconsole_output_file != NULL) {
 		IConsolePrintF(_icolour_def, "file output complete");
@@ -274,7 +274,7 @@
 	return false;
 }
 
-void IConsoleFree(void)
+void IConsoleFree()
 {
 	IConsoleClear();
 	CloseConsoleLogIfActive();
@@ -297,7 +297,7 @@
 	MarkWholeScreenDirty();
 }
 
-void IConsoleSwitch(void)
+void IConsoleSwitch()
 {
 	switch (_iconsole_mode) {
 		case ICONSOLE_CLOSED: {
@@ -317,8 +317,8 @@
 	MarkWholeScreenDirty();
 }
 
-void IConsoleClose(void) {if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();}
-void IConsoleOpen(void)  {if (_iconsole_mode == ICONSOLE_CLOSED) IConsoleSwitch();}
+void IConsoleClose() {if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();}
+void IConsoleOpen()  {if (_iconsole_mode == ICONSOLE_CLOSED) IConsoleSwitch();}
 
 /**
  * Add the entered line into the history so you can look it back

--- a/src/console.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/console.h	Wed Mar 07 11:47:46 2007 +0000
@@ -37,7 +37,7 @@
  * access, before execution/change or after execution/change. This allows
  * for general flow of permissions or special action needed in some cases
  */
-typedef bool IConsoleHook(void);
+typedef bool IConsoleHook();
 typedef struct IConsoleHooks{
 	IConsoleHook *access; ///< trigger when accessing the variable/command
 	IConsoleHook *pre;    ///< trigger before the variable/command is changed/executed
@@ -117,13 +117,13 @@
 VARDEF IConsoleModes _iconsole_mode;
 
 /* console functions */
-void IConsoleInit(void);
-void IConsoleFree(void);
-void IConsoleClearBuffer(void);
+void IConsoleInit();
+void IConsoleFree();
+void IConsoleClearBuffer();
 void IConsoleResize(Window *w);
-void IConsoleSwitch(void);
-void IConsoleClose(void);
-void IConsoleOpen(void);
+void IConsoleSwitch();
+void IConsoleClose();
+void IConsoleOpen();
 
 /* console output */
 void IConsolePrint(uint16 color_code, const char *string);
@@ -150,7 +150,7 @@
 void IConsoleVarExec(const IConsoleVar *var, byte tokencount, char *token[]);
 
 /* console std lib (register ingame commands/aliases/variables) */
-void IConsoleStdLibRegister(void);
+void IConsoleStdLibRegister();
 
 /* Hooking code */
 void IConsoleCmdHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc);

--- a/src/console_cmds.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/console_cmds.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -32,7 +32,7 @@
 
 // ** console command / variable defines ** //
 #define DEF_CONSOLE_CMD(function) static bool function(byte argc, char *argv[])
-#define DEF_CONSOLE_HOOK(function) static bool function(void)
+#define DEF_CONSOLE_HOOK(function) static bool function()
 
 
 /* **************************** */
@@ -41,7 +41,7 @@
 
 #ifdef ENABLE_NETWORK
 
-static inline bool NetworkAvailable(void)
+static inline bool NetworkAvailable()
 {
 	if (!_network_available) {
 		IConsoleError("You cannot use this command because there is no network available.");
@@ -175,7 +175,7 @@
 }
 
 extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm);
-extern void BuildFileList(void);
+extern void BuildFileList();
 extern void SetFiosType(const byte fiostype);
 
 /* Save the map to a file */
@@ -853,7 +853,7 @@
 /* **************************** */
 /*   default console commands   */
 /* **************************** */
-extern bool CloseConsoleLogIfActive(void);
+extern bool CloseConsoleLogIfActive();
 
 DEF_CONSOLE_CMD(ConScript)
 {
@@ -1442,7 +1442,7 @@
 /*  debug commands and variables */
 /* ****************************************** */
 
-static void IConsoleDebugLibRegister(void)
+static void IConsoleDebugLibRegister()
 {
 	/* debugging variables and functions */
 	extern bool _stdlib_con_developer; // XXX extern in .cpp
@@ -1459,7 +1459,7 @@
 /*  console command and variable registration */
 /* ****************************************** */
 
-void IConsoleStdLibRegister(void)
+void IConsoleStdLibRegister()
 {
 	/* stdlib */
 	extern byte _stdlib_developer; // XXX extern in .cpp

--- a/src/currency.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/currency.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -128,7 +128,7 @@
  * get a mask of the allowed currencies depending on the year
  * @return mask of currencies
  */
-uint GetMaskOfAllowedCurrencies(void)
+uint GetMaskOfAllowedCurrencies()
 {
 	uint mask = 0;
 	uint i;
@@ -147,7 +147,7 @@
 /**
  * Verify if the currency chosen by the user is about to be converted to Euro
  **/
-void CheckSwitchToEuro(void)
+void CheckSwitchToEuro()
 {
 	if (_currency_specs[_opt.currency].to_euro != CF_NOEURO &&
 			_currency_specs[_opt.currency].to_euro != CF_ISEURO &&
@@ -161,7 +161,7 @@
  * Called only from newgrf.c.  Will fill _currency_specs array with
  * default values from origin_currency_specs
  **/
-void ResetCurrencies(void)
+void ResetCurrencies()
 {
 	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs));
 }
@@ -170,7 +170,7 @@
  * Build a list of currency names StringIDs to use in a dropdown list
  * @return Pointer to a (static) array of StringIDs
  */
-StringID* BuildCurrencyDropdown(void)
+StringID* BuildCurrencyDropdown()
 {
 	/* Allow room for all currencies, plus a terminator entry */
 	static StringID names[NUM_CURRENCY + 1];

--- a/src/currency.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/currency.h	Wed Mar 07 11:47:46 2007 +0000
@@ -38,10 +38,10 @@
 #define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID])
 #define _currency ((const CurrencySpec*)&_currency_specs[_opt_ptr->currency])
 
-uint GetMaskOfAllowedCurrencies(void);
-void CheckSwitchToEuro(void);
-void ResetCurrencies(void);
-StringID* BuildCurrencyDropdown(void);
+uint GetMaskOfAllowedCurrencies();
+void CheckSwitchToEuro();
+void ResetCurrencies();
+StringID* BuildCurrencyDropdown();
 byte GetNewgrfCurrencyIdConverted(byte grfcurr_id);
 
 #endif /* CURRENCY_H */

--- a/src/date.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/date.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -178,24 +178,24 @@
 	OnNewDay_DisasterVehicle,
 };
 
-extern void WaypointsDailyLoop(void);
-extern void TextMessageDailyLoop(void);
-extern void EnginesDailyLoop(void);
-extern void DisasterDailyLoop(void);
+extern void WaypointsDailyLoop();
+extern void TextMessageDailyLoop();
+extern void EnginesDailyLoop();
+extern void DisasterDailyLoop();
 
-extern void PlayersMonthlyLoop(void);
-extern void EnginesMonthlyLoop(void);
-extern void TownsMonthlyLoop(void);
-extern void IndustryMonthlyLoop(void);
-extern void StationMonthlyLoop(void);
+extern void PlayersMonthlyLoop();
+extern void EnginesMonthlyLoop();
+extern void TownsMonthlyLoop();
+extern void IndustryMonthlyLoop();
+extern void StationMonthlyLoop();
 
-extern void PlayersYearlyLoop(void);
-extern void TrainsYearlyLoop(void);
-extern void RoadVehiclesYearlyLoop(void);
-extern void AircraftYearlyLoop(void);
-extern void ShipsYearlyLoop(void);
+extern void PlayersYearlyLoop();
+extern void TrainsYearlyLoop();
+extern void RoadVehiclesYearlyLoop();
+extern void AircraftYearlyLoop();
+extern void ShipsYearlyLoop();
 
-extern void ShowEndGameChart(void);
+extern void ShowEndGameChart();
 
 
 static const Month _autosave_months[] = {
@@ -221,7 +221,7 @@
 	}
 }
 
-void IncreaseDate(void)
+void IncreaseDate()
 {
 	YearMonthDay ymd;
 

--- a/src/debug.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/debug.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -153,7 +153,7 @@
  * Just return a string with the values of all the debug categorites
  * @return string with debug-levels
  */
-const char *GetDebugString(void)
+const char *GetDebugString()
 {
 	const DebugLevel *i;
 	static char dbgstr[100];

--- a/src/debug.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/debug.h	Wed Mar 07 11:47:46 2007 +0000
@@ -84,7 +84,7 @@
 #endif /* NO_DEBUG_MESSAGES */
 
 void SetDebugString(const char *s);
-const char *GetDebugString(void);
+const char *GetDebugString();
 
 /* MSVCRT of course has to have a different syntax for long long *sigh* */
 #if defined(_MSC_VER) || defined(__MINGW32__)
@@ -95,7 +95,7 @@
 
 /* Used for profiling */
 #define TIC() {\
-	extern uint64 _rdtsc(void);\
+	extern uint64 _rdtsc();\
 	uint64 _xxx_ = _rdtsc();\
 	static uint64 __sum__ = 0;\
 	static uint32 __i__ = 0;

--- a/src/dedicated.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/dedicated.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -22,7 +22,7 @@
 # define PRINTF_PID_T "%d"
 #endif
 
-void DedicatedFork(void)
+void DedicatedFork()
 {
 	/* Fork the program */
 	pid_t pid = fork();
@@ -63,6 +63,6 @@
 
 #else
 
-void DedicatedFork(void) {}
+void DedicatedFork() {}
 
 #endif /* ENABLE_NETWORK */

--- a/src/depot.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/depot.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -47,7 +47,7 @@
 /**
  * Allocate a new depot
  */
-Depot *AllocateDepot(void)
+Depot *AllocateDepot()
 {
 	Depot *d;
 
@@ -85,7 +85,7 @@
 	DeleteWindowById(WC_VEHICLE_DEPOT, depot->xy);
 }
 
-void InitializeDepots(void)
+void InitializeDepots()
 {
 	CleanPool(&_Depot_pool);
 	AddBlockToPool(&_Depot_pool);
@@ -99,7 +99,7 @@
 	SLE_END()
 };
 
-static void Save_DEPT(void)
+static void Save_DEPT()
 {
 	Depot *depot;
 
@@ -109,7 +109,7 @@
 	}
 }
 
-static void Load_DEPT(void)
+static void Load_DEPT()
 {
 	int index;
 

--- a/src/depot.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/depot.h	Wed Mar 07 11:47:46 2007 +0000
@@ -107,8 +107,8 @@
 }
 
 Depot *GetDepotByTile(TileIndex tile);
-void InitializeDepots(void);
-Depot *AllocateDepot(void);
+void InitializeDepots();
+Depot *AllocateDepot();
 
 void DeleteDepotHighlightOfVehicle(const Vehicle *v);
 

--- a/src/disaster_cmd.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/disaster_cmd.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -758,12 +758,12 @@
 	// not used
 }
 
-typedef void DisasterInitProc(void);
+typedef void DisasterInitProc();
 
 
 /** Zeppeliner which crashes on a small airport if one found,
  * otherwise crashes on a random tile */
-static void Disaster_Zeppeliner_Init(void)
+static void Disaster_Zeppeliner_Init()
 {
 	Vehicle *v = ForceAllocateSpecialVehicle(), *u;
 	Station *st;
@@ -797,7 +797,7 @@
 
 /** Ufo which flies around aimlessly from the middle of the map a bit
  * until it locates a road vehicle which it targets and then destroys */
-static void Disaster_Small_Ufo_Init(void)
+static void Disaster_Small_Ufo_Init()
 {
 	Vehicle *v = ForceAllocateSpecialVehicle(), *u;
 	int x;
@@ -821,7 +821,7 @@
 
 
 /* Combat airplane which destroys an oil refinery */
-static void Disaster_Airplane_Init(void)
+static void Disaster_Airplane_Init()
 {
 	Industry *i, *found;
 	Vehicle *v, *u;
@@ -857,7 +857,7 @@
 
 
 /** Combat helicopter that destroys a factory */
-static void Disaster_Helicopter_Init(void)
+static void Disaster_Helicopter_Init()
 {
 	Industry *i, *found;
 	Vehicle *v, *u, *w;
@@ -899,7 +899,7 @@
 
 /* Big Ufo which lands on a piece of rail and will consequently be shot
  * down by a combat airplane, destroying the surroundings */
-static void Disaster_Big_Ufo_Init(void)
+static void Disaster_Big_Ufo_Init()
 {
 	Vehicle *v = ForceAllocateSpecialVehicle(), *u;
 	int x, y;
@@ -924,7 +924,7 @@
 
 
 /* Curious submarine #1, just floats around */
-static void Disaster_Small_Submarine_Init(void)
+static void Disaster_Small_Submarine_Init()
 {
 	Vehicle *v = ForceAllocateSpecialVehicle();
 	int x, y;
@@ -949,7 +949,7 @@
 
 
 /* Curious submarine #2, just floats around */
-static void Disaster_Big_Submarine_Init(void)
+static void Disaster_Big_Submarine_Init()
 {
 	Vehicle *v = ForceAllocateSpecialVehicle();
 	int x,y;
@@ -975,7 +975,7 @@
 
 /** Coal mine catastrophe, destroys a stretch of 30 tiles of
  * land in a certain direction */
-static void Disaster_CoalMine_Init(void)
+static void Disaster_CoalMine_Init()
 {
 	int index = GB(Random(), 0, 4);
 	uint m;
@@ -1031,7 +1031,7 @@
 };
 
 
-static void DoDisaster(void)
+static void DoDisaster()
 {
 	byte buf[lengthof(_dis_years)];
 	uint i;
@@ -1048,12 +1048,12 @@
 }
 
 
-static void ResetDisasterDelay(void)
+static void ResetDisasterDelay()
 {
 	_disaster_delay = GB(Random(), 0, 9) + 730;
 }
 
-void DisasterDailyLoop(void)
+void DisasterDailyLoop()
 {
 	if (--_disaster_delay != 0) return;
 
@@ -1062,7 +1062,7 @@
 	if (_opt.diff.disasters != 0) DoDisaster();
 }
 
-void StartupDisasters(void)
+void StartupDisasters()
 {
 	ResetDisasterDelay();
 }

--- a/src/dock_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/dock_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -17,8 +17,8 @@
 #include "command.h"
 #include "variables.h"
 
-static void ShowBuildDockStationPicker(void);
-static void ShowBuildDocksDepotPicker(void);
+static void ShowBuildDockStationPicker();
+static void ShowBuildDocksDepotPicker();
 
 static Axis _ship_depot_direction;
 
@@ -216,7 +216,7 @@
 	BuildDocksToolbWndProc
 };
 
-void ShowBuildDocksToolbar(void)
+void ShowBuildDocksToolbar()
 {
 	if (!IsValidPlayer(_current_player)) return;
 
@@ -290,12 +290,12 @@
 	BuildDockStationWndProc
 };
 
-static void ShowBuildDockStationPicker(void)
+static void ShowBuildDockStationPicker()
 {
 	AllocateWindowDesc(&_build_dock_station_desc);
 }
 
-static void UpdateDocksDirection(void)
+static void UpdateDocksDirection()
 {
 	if (_ship_depot_direction != AXIS_X) {
 		SetTileSelectSize(1, 2);
@@ -360,14 +360,14 @@
 };
 
 
-static void ShowBuildDocksDepotPicker(void)
+static void ShowBuildDocksDepotPicker()
 {
 	AllocateWindowDesc(&_build_docks_depot_desc);
 	UpdateDocksDirection();
 }
 
 
-void InitializeDockGui(void)
+void InitializeDockGui()
 {
 	_ship_depot_direction = AXIS_X;
 }

--- a/src/economy.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/economy.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -581,7 +581,7 @@
 	return 0;
 }
 
-static void PlayersGenStatistics(void)
+static void PlayersGenStatistics()
 {
 	Station *st;
 	Player *p;
@@ -625,7 +625,7 @@
 	*value += tmp >> 16;
 }
 
-static void AddInflation(void)
+static void AddInflation()
 {
 	/* Approximation for (100 + infl_amount)% ** (1 / 12) - 100%
 	 * scaled by 65536
@@ -658,7 +658,7 @@
 	InvalidateWindow(WC_PAYMENT_RATES, 0);
 }
 
-static void PlayersPayInterest(void)
+static void PlayersPayInterest()
 {
 	const Player* p;
 	int interest = _economy.interest_rate * 54;
@@ -676,7 +676,7 @@
 	}
 }
 
-static void HandleEconomyFluctuations(void)
+static void HandleEconomyFluctuations()
 {
 	if (_opt.diff.economy == 0) return;
 
@@ -756,7 +756,7 @@
 /**
  * Reset changes to the price base multipliers.
  */
-void ResetPriceBaseMultipliers(void)
+void ResetPriceBaseMultipliers()
 {
 	uint i;
 
@@ -778,7 +778,7 @@
 	price_base_multiplier[price] = factor;
 }
 
-void StartupEconomy(void)
+void StartupEconomy()
 {
 	int i;
 
@@ -995,7 +995,7 @@
 }
 
 
-static void SubsidyMonthlyHandler(void)
+static void SubsidyMonthlyHandler()
 {
 	Subsidy *s;
 	Pair pair;
@@ -1074,7 +1074,7 @@
 	SLE_END()
 };
 
-static void Save_SUBS(void)
+static void Save_SUBS()
 {
 	int i;
 	Subsidy *s;
@@ -1088,7 +1088,7 @@
 	}
 }
 
-static void Load_SUBS(void)
+static void Load_SUBS()
 {
 	int index;
 	while ((index = SlIterateArray()) != -1)
@@ -1603,7 +1603,7 @@
 	return result;
 }
 
-void PlayersMonthlyLoop(void)
+void PlayersMonthlyLoop()
 {
 	PlayersGenStatistics();
 	if (_patches.inflation && _cur_year < MAX_YEAR)
@@ -1757,14 +1757,14 @@
 }
 
 /** Prices */
-static void SaveLoad_PRIC(void)
+static void SaveLoad_PRIC()
 {
 	SlArray(&_price,      NUM_PRICES, SLE_INT32);
 	SlArray(&_price_frac, NUM_PRICES, SLE_UINT16);
 }
 
 /** Cargo payment rates */
-static void SaveLoad_CAPR(void)
+static void SaveLoad_CAPR()
 {
 	SlArray(&_cargo_payment_rates,      NUM_CARGO, SLE_INT32);
 	SlArray(&_cargo_payment_rates_frac, NUM_CARGO, SLE_UINT16);
@@ -1781,7 +1781,7 @@
 };
 
 /** Economy variables */
-static void SaveLoad_ECMY(void)
+static void SaveLoad_ECMY()
 {
 	SlObject(&_economy, _economy_desc);
 }

--- a/src/economy.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/economy.h	Wed Mar 07 11:47:46 2007 +0000
@@ -5,7 +5,7 @@
 #ifndef ECONOMY_H
 #define ECONOMY_H
 
-void ResetPriceBaseMultipliers(void);
+void ResetPriceBaseMultipliers();
 void SetPriceBaseMultiplier(uint price, byte factor);
 
 typedef struct {

--- a/src/engine.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/engine.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -34,7 +34,7 @@
 
 void ShowEnginePreviewWindow(EngineID engine);
 
-void DeleteCustomEngineNames(void)
+void DeleteCustomEngineNames()
 {
 	uint i;
 	StringID old;
@@ -48,13 +48,13 @@
 	_vehicle_design_names &= ~1;
 }
 
-void LoadCustomEngineNames(void)
+void LoadCustomEngineNames()
 {
 	/* XXX: not done */
 	DEBUG(misc, 1, "LoadCustomEngineNames: not done");
 }
 
-static void SetupEngineNames(void)
+static void SetupEngineNames()
 {
 	StringID *name;
 
@@ -92,7 +92,7 @@
 	InvalidateWindowClasses(WC_REPLACE_VEHICLE);
 }
 
-void AddTypeToEngines(void)
+void AddTypeToEngines()
 {
 	Engine* e = _engines;
 
@@ -102,7 +102,7 @@
 	do e->type = VEH_Aircraft; while (++e < &_engines[TOTAL_NUM_ENGINES]);
 }
 
-void StartupEngines(void)
+void StartupEngines()
 {
 	Engine *e;
 	const EngineInfo *ei;
@@ -209,7 +209,7 @@
 	return best_player;
 }
 
-void EnginesDailyLoop(void)
+void EnginesDailyLoop()
 {
 	EngineID i;
 
@@ -321,7 +321,7 @@
 	AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_VEHICLEAVAIL), 0, 0);
 }
 
-void EnginesMonthlyLoop(void)
+void EnginesMonthlyLoop()
 {
 	Engine *e;
 
@@ -423,7 +423,7 @@
 }
 
 
-static EngineRenew *AllocateEngineRenew(void)
+static EngineRenew *AllocateEngineRenew()
 {
 	EngineRenew *er;
 
@@ -538,7 +538,7 @@
 	SLE_END()
 };
 
-static void Save_ERNW(void)
+static void Save_ERNW()
 {
 	EngineRenew *er;
 
@@ -548,7 +548,7 @@
 	}
 }
 
-static void Load_ERNW(void)
+static void Load_ERNW()
 {
 	int index;
 
@@ -590,7 +590,7 @@
 	SLE_END()
 };
 
-static void Save_ENGN(void)
+static void Save_ENGN()
 {
 	uint i;
 
@@ -600,7 +600,7 @@
 	}
 }
 
-static void Load_ENGN(void)
+static void Load_ENGN()
 {
 	int index;
 	while ((index = SlIterateArray()) != -1) {
@@ -608,7 +608,7 @@
 	}
 }
 
-static void LoadSave_ENGS(void)
+static void LoadSave_ENGS()
 {
 	SlArray(_engine_name_strings, lengthof(_engine_name_strings), SLE_STRINGID);
 }
@@ -619,7 +619,7 @@
 	{ 'ERNW', Save_ERNW,     Load_ERNW,     CH_ARRAY | CH_LAST},
 };
 
-void InitializeEngines(void)
+void InitializeEngines()
 {
 	/* Clean the engine renew pool and create 1 block in it */
 	CleanPool(&_EngineRenew_pool);

--- a/src/engine.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/engine.h	Wed Mar 07 11:47:46 2007 +0000
@@ -140,8 +140,8 @@
 static const EngineID INVALID_ENGINE = 0xFFFF;
 
 
-void AddTypeToEngines(void);
-void StartupEngines(void);
+void AddTypeToEngines();
+void StartupEngines();
 
 
 void DrawTrainEngine(int x, int y, EngineID engine, SpriteID pal);
@@ -149,8 +149,8 @@
 void DrawShipEngine(int x, int y, EngineID engine, SpriteID pal);
 void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal);
 
-void LoadCustomEngineNames(void);
-void DeleteCustomEngineNames(void);
+void LoadCustomEngineNames();
+void DeleteCustomEngineNames();
 
 bool IsEngineBuildable(EngineID engine, byte type, PlayerID player);
 

--- a/src/fileio.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fileio.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -34,7 +34,7 @@
 static Fio _fio;
 
 /* Get current position in file */
-uint32 FioGetPos(void)
+uint32 FioGetPos()
 {
 	return _fio.pos + (_fio.buffer - _fio.buffer_start) - FIO_BUFFER_SIZE;
 }
@@ -73,7 +73,7 @@
 	FioSeekTo(GB(pos, 0, 24), SEEK_SET);
 }
 
-byte FioReadByte(void)
+byte FioReadByte()
 {
 	if (_fio.buffer == _fio.buffer_end) {
 		_fio.pos += FIO_BUFFER_SIZE;
@@ -94,13 +94,13 @@
 	}
 }
 
-uint16 FioReadWord(void)
+uint16 FioReadWord()
 {
 	byte b = FioReadByte();
 	return (FioReadByte() << 8) | b;
 }
 
-uint32 FioReadDword(void)
+uint32 FioReadDword()
 {
 	uint b = FioReadWord();
 	return (FioReadWord() << 16) | b;
@@ -124,7 +124,7 @@
 	}
 }
 
-void FioCloseAll(void)
+void FioCloseAll()
 {
 	int i;
 

--- a/src/fileio.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fileio.h	Wed Mar 07 11:47:46 2007 +0000
@@ -7,11 +7,11 @@
 
 void FioSeekTo(uint32 pos, int mode);
 void FioSeekToFile(uint32 pos);
-uint32 FioGetPos(void);
-byte FioReadByte(void);
-uint16 FioReadWord(void);
-uint32 FioReadDword(void);
-void FioCloseAll(void);
+uint32 FioGetPos();
+byte FioReadByte();
+uint16 FioReadWord();
+uint32 FioReadDword();
+void FioCloseAll();
 FILE *FioFOpenFile(const char *filename);
 void FioOpenFile(int slot, const char *filename);
 void FioReadBlock(void *ptr, uint size);

--- a/src/fios.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fios.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -34,7 +34,7 @@
 extern bool FiosIsRoot(const char *path);
 extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
 extern bool FiosIsHiddenFile(const struct dirent *ent);
-extern void FiosGetDrives(void);
+extern void FiosGetDrives();
 extern bool FiosGetDiskFreeSpace(const char *path, uint32 *tot);
 
 /* get the name of an oldstyle savegame */
@@ -44,7 +44,7 @@
  * Allocate a new FiosItem.
  * @return A pointer to the newly allocated FiosItem.
  */
-FiosItem *FiosAlloc(void)
+FiosItem *FiosAlloc()
 {
 	if (_fios_count == _fios_alloc) {
 		_fios_alloc += 256;
@@ -78,7 +78,7 @@
 /**
  * Free the list of savegames
  */
-void FiosFreeSavegameList(void)
+void FiosFreeSavegameList()
 {
 	free(_fios_items);
 	_fios_items = NULL;

--- a/src/fios.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fios.h	Wed Mar 07 11:47:46 2007 +0000
@@ -39,7 +39,7 @@
 /* Get a list of Heightmaps */
 FiosItem *FiosGetHeightmapList(int mode);
 /* Free the list of savegames */
-void FiosFreeSavegameList(void);
+void FiosFreeSavegameList();
 /* Browse to. Returns a filename w/path if we reached a file. */
 char *FiosBrowseTo(const FiosItem *item);
 /* Return path, free space and stringID */
@@ -49,7 +49,7 @@
 /* Make a filename from a name */
 void FiosMakeSavegameName(char *buf, const char *name, size_t size);
 /* Allocate a new FiosItem */
-FiosItem *FiosAlloc(void);
+FiosItem *FiosAlloc();
 
 int CDECL compare_FiosItems(const void *a, const void *b);
 

--- a/src/fontcache.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fontcache.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -278,7 +278,7 @@
 }
 
 
-void InitFreeType(void)
+void InitFreeType()
 {
 	if (StrEmpty(_freetype.small_font) && StrEmpty(_freetype.medium_font) && StrEmpty(_freetype.large_font)) {
 		DEBUG(freetype, 1, "No font faces specified, using sprite fonts instead");
@@ -492,7 +492,7 @@
 }
 
 
-void InitializeUnicodeGlyphMap(void)
+void InitializeUnicodeGlyphMap()
 {
 	FontSize size;
 	SpriteID base;

--- a/src/fontcache.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/fontcache.h	Wed Mar 07 11:47:46 2007 +0000
@@ -10,7 +10,7 @@
 void SetUnicodeGlyph(FontSize size, uint32 key, SpriteID sprite);
 
 /** Initialize the glyph map */
-void InitializeUnicodeGlyphMap(void);
+void InitializeUnicodeGlyphMap();
 
 #ifdef WITH_FREETYPE
 
@@ -25,14 +25,14 @@
 
 extern FreeTypeSettings _freetype;
 
-void InitFreeType(void);
+void InitFreeType();
 const struct Sprite *GetGlyph(FontSize size, uint32 key);
 uint GetGlyphWidth(FontSize size, uint32 key);
 
 #else
 
 /* Stub for initializiation */
-static inline void InitFreeType(void) {}
+static inline void InitFreeType() {}
 
 /** Get the Sprite for a glyph */
 static inline const Sprite *GetGlyph(FontSize size, uint32 key)

--- a/src/functions.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/functions.h	Wed Mar 07 11:47:46 2007 +0000
@@ -8,7 +8,7 @@
 #include "gfx.h"
 
 void DoClearSquare(TileIndex tile);
-void RunTileLoop(void);
+void RunTileLoop();
 
 uint GetPartialZ(int x, int y, Slope corners);
 uint GetSlopeZ(int x, int y);
@@ -80,11 +80,11 @@
 
 // Mersenne twister functions
 void SeedMT(uint32 seed);
-uint32 RandomMT(void);
+uint32 RandomMT();
 
 
 #ifdef MERSENNE_TWISTER
-	static inline uint32 Random(void) { return RandomMT(); }
+	static inline uint32 Random() { return RandomMT(); }
 	uint RandomRange(uint max);
 #else
 
@@ -94,33 +94,33 @@
 	#define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__)
 	uint DoRandomRange(uint max, int line, const char *file);
 #else
-	uint32 Random(void);
+	uint32 Random();
 	uint RandomRange(uint max);
 #endif
 #endif // MERSENNE_TWISTER
 
 static inline TileIndex RandomTileSeed(uint32 r) { return TILE_MASK(r); }
-static inline TileIndex RandomTile(void) { return TILE_MASK(Random()); }
+static inline TileIndex RandomTile() { return TILE_MASK(Random()); }
 
 
-uint32 InteractiveRandom(void); // Used for random sequences that are not the same on the other end of the multiplayer link
+uint32 InteractiveRandom(); // Used for random sequences that are not the same on the other end of the multiplayer link
 uint InteractiveRandomRange(uint max);
 
 /* texteff.cpp */
-void MoveAllTextEffects(void);
+void MoveAllTextEffects();
 void AddTextEffect(StringID msg, int x, int y, uint16 duration);
-void InitTextEffects(void);
+void InitTextEffects();
 void DrawTextEffects(DrawPixelInfo *dpi);
 
-void InitTextMessage(void);
-void DrawTextMessage(void);
+void InitTextMessage();
+void DrawTextMessage();
 void CDECL AddTextMessage(uint16 color, uint8 duration, const char *message, ...);
-void UndrawTextMessage(void);
+void UndrawTextMessage();
 
 bool AddAnimatedTile(TileIndex tile);
 void DeleteAnimatedTile(TileIndex tile);
-void AnimateAnimatedTiles(void);
-void InitializeAnimatedTiles(void);
+void AnimateAnimatedTiles();
+void InitializeAnimatedTiles();
 
 /* tunnelbridge_cmd.cpp */
 bool CheckBridge_Stuff(byte bridge_type, uint bridge_len);
@@ -128,7 +128,7 @@
 int CalcBridgeLenCostFactor(int x);
 
 /* misc_cmd.cpp */
-void PlaceTreesRandomly(void);
+void PlaceTreesRandomly();
 
 void InitializeLandscapeVariables(bool only_constants);
 
@@ -142,7 +142,7 @@
 #define AllocateNameUnique(name, skip) RealAllocateName(name, skip, true)
 #define AllocateName(name, skip) RealAllocateName(name, skip, false)
 StringID RealAllocateName(const char *name, byte skip, bool check_double);
-void ConvertNameArray(void);
+void ConvertNameArray();
 
 /* misc functions */
 void MarkTileDirty(int x, int y);
@@ -157,7 +157,7 @@
 void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, byte mode, Window *w);
 void SetObjectToPlace(CursorID icon, SpriteID pal, byte mode, WindowClass window_class, WindowNumber window_num);
 
-void ResetObjectToPlace(void);
+void ResetObjectToPlace();
 
 bool ScrollWindowTo(int x, int y, Window * w);
 
@@ -181,12 +181,12 @@
 void ShowHighscoreTable(int difficulty, int8 rank);
 TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng);
 
-void AfterLoadTown(void);
-void UpdatePatches(void);
-void AskExitGame(void);
-void AskExitToGameMenu(void);
+void AfterLoadTown();
+void UpdatePatches();
+void AskExitGame();
+void AskExitToGameMenu();
 
-void RedrawAutosave(void);
+void RedrawAutosave();
 
 StringID RemapOldStringID(StringID s);
 
@@ -203,19 +203,19 @@
 void ShowSaveLoadDialog(int mode);
 
 /* callback from drivers that is called if the game size changes dynamically */
-void GameSizeChanged(void);
+void GameSizeChanged();
 bool FileExists(const char *filename);
 bool ReadLanguagePack(int index);
-void InitializeLanguagePacks(void);
+void InitializeLanguagePacks();
 const char *GetCurrentLocale(const char *param);
 void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
 
-void LoadFromConfig(void);
-void SaveToConfig(void);
-void CheckConfig(void);
+void LoadFromConfig();
+void SaveToConfig();
+void CheckConfig();
 int ttd_main(int argc, char* argv[]);
-void HandleExitGameRequest(void);
+void HandleExitGameRequest();
 
-void DeterminePaths(void);
+void DeterminePaths();
 
 #endif /* FUNCTIONS_H */

--- a/src/genworld.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/genworld.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -20,19 +20,19 @@
 #include "date.h"
 
 void GenerateLandscape(byte mode);
-void GenerateClearTile(void);
-void GenerateIndustries(void);
-void GenerateUnmovables(void);
-bool GenerateTowns(void);
-void GenerateTrees(void);
+void GenerateClearTile();
+void GenerateIndustries();
+void GenerateUnmovables();
+bool GenerateTowns();
+void GenerateTrees();
 
-void StartupEconomy(void);
-void StartupPlayers(void);
-void StartupDisasters(void);
+void StartupEconomy();
+void StartupPlayers();
+void StartupDisasters();
 
 void InitializeGame(int mode, uint size_x, uint size_y);
 
-void ConvertGroundTilesIntoWaterTiles(void);
+void ConvertGroundTilesIntoWaterTiles();
 
 /* Please only use this variable in genworld.h and genworld.c and
  *  nowhere else. For speed improvements we need it to be global, but
@@ -58,7 +58,7 @@
  *  writing in a thread, it can cause damaged data (reading and writing the
  *  same tile at the same time).
  */
-bool IsGeneratingWorldReadyForPaint(void)
+bool IsGeneratingWorldReadyForPaint()
 {
 	/* If we are in quit_thread mode, ignore this and always return false. This
 	 *  forces the screen to not be drawn, and the GUI not to wait for a draw. */
@@ -70,7 +70,7 @@
 /**
  * Tells if the world generation is done in a thread or not.
  */
-bool IsGenerateWorldThreaded(void)
+bool IsGenerateWorldThreaded()
 {
 	return _gw.threaded && !_gw.quit_thread;
 }
@@ -180,7 +180,7 @@
  * This will wait for the thread to finish up his work. It will not continue
  *  till the work is done.
  */
-void WaitTillGeneratedWorld(void)
+void WaitTillGeneratedWorld()
 {
 	if (_gw.thread == NULL) return;
 	_gw.quit_thread = true;
@@ -192,7 +192,7 @@
 /**
  * Initializes the abortion process
  */
-void AbortGeneratingWorld(void)
+void AbortGeneratingWorld()
 {
 	_gw.abort = true;
 }
@@ -200,7 +200,7 @@
 /**
  * Is the generation being aborted?
  */
-bool IsGeneratingWorldAborted(void)
+bool IsGeneratingWorldAborted()
 {
 	return _gw.abort;
 }
@@ -208,7 +208,7 @@
 /**
  * Really handle the abortion, i.e. clean up some of the mess
  */
-void HandleGeneratingWorldAbortion(void)
+void HandleGeneratingWorldAbortion()
 {
 	/* Clean up - in SE create an empty map, otherwise, go to intro menu */
 	_switch_mode = (_game_mode == GM_EDITOR) ? SM_EDITOR : SM_MENU;

--- a/src/genworld.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/genworld.h	Wed Mar 07 11:47:46 2007 +0000
@@ -26,8 +26,8 @@
 	GENERATE_NEW_SEED = (uint)-1, ///< Create a new random seed
 };
 
-typedef void gw_done_proc(void);
-typedef void gw_abort_proc(void);
+typedef void gw_done_proc();
+typedef void gw_abort_proc();
 
 typedef struct gw_info {
 	bool active;           ///< Is generating world active
@@ -66,7 +66,7 @@
 /**
  * Check if we are currently in the process of generating a world.
  */
-static inline bool IsGeneratingWorld(void)
+static inline bool IsGeneratingWorld()
 {
 	extern gw_info _gw;
 
@@ -75,23 +75,23 @@
 
 /* genworld.cpp */
 void SetGeneratingWorldPaintStatus(bool status);
-bool IsGeneratingWorldReadyForPaint(void);
-bool IsGenerateWorldThreaded(void);
+bool IsGeneratingWorldReadyForPaint();
+bool IsGenerateWorldThreaded();
 void GenerateWorldSetCallback(gw_done_proc *proc);
 void GenerateWorldSetAbortCallback(gw_abort_proc *proc);
-void WaitTillGeneratedWorld(void);
+void WaitTillGeneratedWorld();
 void GenerateWorld(int mode, uint size_x, uint size_y);
-void AbortGeneratingWorld(void);
-bool IsGeneratingWorldAborted(void);
-void HandleGeneratingWorldAbortion(void);
+void AbortGeneratingWorld();
+bool IsGeneratingWorldAborted();
+void HandleGeneratingWorldAbortion();
 
 /* genworld_gui.cpp */
 void SetGeneratingWorldProgress(gwp_class cls, uint total);
 void IncreaseGeneratingWorldProgress(gwp_class cls);
-void PrepareGenerateWorldProgress(void);
-void ShowGenerateWorldProgress(void);
+void PrepareGenerateWorldProgress();
+void ShowGenerateWorldProgress();
 void StartNewGameWithoutGUI(uint seed);
-void ShowCreateScenario(void);
-void StartScenarioEditor(void);
+void ShowCreateScenario();
+void StartScenarioEditor();
 
 #endif /* GENWORLD_H */

--- a/src/genworld_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/genworld_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -533,17 +533,17 @@
 	if (w != NULL) InvalidateWindow(WC_GENERATE_LANDSCAPE, mode);
 }
 
-void ShowGenerateLandscape(void)
+void ShowGenerateLandscape()
 {
 	_ShowGenerateLandscape(GLWP_GENERATE);
 }
 
-void ShowHeightmapLoad(void)
+void ShowHeightmapLoad()
 {
 	_ShowGenerateLandscape(GLWP_HEIGHTMAP);
 }
 
-void StartScenarioEditor(void)
+void StartScenarioEditor()
 {
 	StartGeneratingLandscape(GLWP_SCENARIO);
 }
@@ -726,7 +726,7 @@
 	CreateScenarioWndProc,
 };
 
-void ShowCreateScenario(void)
+void ShowCreateScenario()
 {
 	DeleteWindowByClass(WC_GENERATE_LANDSCAPE);
 	AllocateWindowDescFront(&_create_scenario_desc, GLWP_SCENARIO);
@@ -809,7 +809,7 @@
 /**
  * Initializes the progress counters to the starting point.
  */
-void PrepareGenerateWorldProgress(void)
+void PrepareGenerateWorldProgress()
 {
 	_tp.cls   = STR_WORLD_GENERATION;
 	_tp.current = 0;
@@ -821,7 +821,7 @@
 /**
  * Show the window where a user can follow the process of the map generation.
  */
-void ShowGenerateWorldProgress(void)
+void ShowGenerateWorldProgress()
 {
 	AllocateWindowDescFront(&_show_terrain_progress_desc, 0);
 }

--- a/src/gfx.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/gfx.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -1524,9 +1524,9 @@
 	}
 }
 
-void DoPaletteAnimations(void);
+void DoPaletteAnimations();
 
-void GfxInitPalettes(void)
+void GfxInitPalettes()
 {
 	memcpy(_cur_palette, _palettes[_use_dos_palette ? 1 : 0], sizeof(_cur_palette));
 
@@ -1538,7 +1538,7 @@
 #define EXTR(p, q) (((uint16)(_timer_counter * (p)) * (q)) >> 16)
 #define EXTR2(p, q) (((uint16)(~_timer_counter * (p)) * (q)) >> 16)
 
-void DoPaletteAnimations(void)
+void DoPaletteAnimations()
 {
 	const Colour *s;
 	Colour *d;
@@ -1649,7 +1649,7 @@
 }
 
 
-void LoadStringWidthTable(void)
+void LoadStringWidthTable()
 {
 	uint i;
 
@@ -1678,7 +1678,7 @@
 }
 
 
-void ScreenSizeChanged(void)
+void ScreenSizeChanged()
 {
 	/* check the dirty rect */
 	if (_invalid_rect.right >= _screen.width) _invalid_rect.right = _screen.width;
@@ -1688,7 +1688,7 @@
 	_cursor.visible = false;
 }
 
-void UndrawMouseCursor(void)
+void UndrawMouseCursor()
 {
 	if (_cursor.visible) {
 		_cursor.visible = false;
@@ -1701,7 +1701,7 @@
 	}
 }
 
-void DrawMouseCursor(void)
+void DrawMouseCursor()
 {
 	int x;
 	int y;
@@ -1794,7 +1794,7 @@
 	_video_driver->make_dirty(left, top, right - left, bottom - top);
 }
 
-void DrawDirtyBlocks(void)
+void DrawDirtyBlocks()
 {
 	byte *b = _dirty_blocks;
 	const int w = ALIGN(_screen.width, 64);
@@ -1916,7 +1916,7 @@
 	} while (--height != 0);
 }
 
-void MarkWholeScreenDirty(void)
+void MarkWholeScreenDirty()
 {
 	SetDirtyBlocks(0, 0, _screen.width, _screen.height);
 }
@@ -1995,7 +1995,7 @@
 	cv->dirty = true;
 }
 
-static void SwitchAnimatedCursor(void)
+static void SwitchAnimatedCursor()
 {
 	const AnimCursor *cur = _cursor.animate_cur;
 
@@ -2007,7 +2007,7 @@
 	_cursor.animate_cur     = cur + 1;
 }
 
-void CursorTick(void)
+void CursorTick()
 {
 	if (_cursor.animate_timeout != 0 && --_cursor.animate_timeout == 0)
 		SwitchAnimatedCursor();

--- a/src/gfx.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/gfx.h	Wed Mar 07 11:47:46 2007 +0000
@@ -86,9 +86,9 @@
 	GM_EDITOR
 };
 
-void GameLoop(void);
+void GameLoop();
 
-void CreateConsole(void);
+void CreateConsole();
 
 typedef int32 CursorID;
 typedef byte Pixel;
@@ -166,18 +166,18 @@
 extern Colour _cur_palette[256];
 
 void HandleKeypress(uint32 key);
-void HandleMouseEvents(void);
+void HandleMouseEvents();
 void CSleep(int milliseconds);
-void UpdateWindows(void);
+void UpdateWindows();
 
-uint32 InteractiveRandom(void); //< Used for random sequences that are not the same on the other end of the multiplayer link
+uint32 InteractiveRandom(); //< Used for random sequences that are not the same on the other end of the multiplayer link
 uint InteractiveRandomRange(uint max);
-void DrawTextMessage(void);
-void DrawMouseCursor(void);
-void ScreenSizeChanged(void);
-void HandleExitGameRequest(void);
-void GameSizeChanged(void);
-void UndrawMouseCursor(void);
+void DrawTextMessage();
+void DrawMouseCursor();
+void ScreenSizeChanged();
+void HandleExitGameRequest();
+void GameSizeChanged();
+void UndrawMouseCursor();
 
 #include "helpers.hpp"
 
@@ -222,14 +222,14 @@
 
 BoundingRect GetStringBoundingBox(const char *str);
 uint32 FormatStringLinebreaks(char *str, int maxw);
-void LoadStringWidthTable(void);
+void LoadStringWidthTable();
 void DrawStringMultiCenter(int x, int y, StringID str, int maxw);
 uint DrawStringMultiLine(int x, int y, StringID str, int maxw);
-void DrawDirtyBlocks(void);
+void DrawDirtyBlocks();
 void SetDirtyBlocks(int left, int top, int right, int bottom);
-void MarkWholeScreenDirty(void);
+void MarkWholeScreenDirty();
 
-void GfxInitPalettes(void);
+void GfxInitPalettes();
 
 bool FillDrawPixelInfo(DrawPixelInfo* n, int left, int top, int width, int height);
 
@@ -239,10 +239,10 @@
 void SetMouseCursor(CursorID cursor);
 void SetMouseCursor(SpriteID sprite, SpriteID pal);
 void SetAnimatedMouseCursor(const AnimCursor *table);
-void CursorTick(void);
-void DrawMouseCursor(void);
-void ScreenSizeChanged(void);
-void UndrawMouseCursor(void);
+void CursorTick();
+void DrawMouseCursor();
+void ScreenSizeChanged();
+void UndrawMouseCursor();
 bool ChangeResInGame(int w, int h);
 void SortResolutions(int count);
 void ToggleFullScreen(bool fs);

--- a/src/gfxinit.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/gfxinit.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -162,7 +162,7 @@
  * If neither are found, Windows palette is assumed.
  *
  * (Note: Also checks sample.cat for corruption) */
-void CheckExternalFiles(void)
+void CheckExternalFiles()
 {
 	uint i;
 	/* count of files from this version */
@@ -340,7 +340,7 @@
 };
 
 
-static void LoadSpriteTables(void)
+static void LoadSpriteTables()
 {
 	const FileList* files = _use_dos_palette ? &files_dos : &files_win;
 	uint load_index;
@@ -400,7 +400,7 @@
 }
 
 
-void GfxLoadSprites(void)
+void GfxLoadSprites()
 {
 	DEBUG(sprite, 2, "Loading sprite set %d", _opt.landscape);
 

--- a/src/gfxinit.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/gfxinit.h	Wed Mar 07 11:47:46 2007 +0000
@@ -5,7 +5,7 @@
 #ifndef GFXINIT_H
 #define GFXINIT_H
 
-void CheckExternalFiles(void);
-void GfxLoadSprites(void);
+void CheckExternalFiles();
+void GfxLoadSprites();
 
 #endif /* GFXINIT_H */

--- a/src/graph_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/graph_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -316,7 +316,7 @@
 	GraphLegendWndProc
 };
 
-static void ShowGraphLegend(void)
+static void ShowGraphLegend()
 {
 	AllocateWindowDescFront(&_graph_legend_desc, 0);
 }
@@ -415,7 +415,7 @@
 };
 
 
-void ShowOperatingProfitGraph(void)
+void ShowOperatingProfitGraph()
 {
 	if (AllocateWindowDescFront(&_operating_profit_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
@@ -483,7 +483,7 @@
 	IncomeGraphWndProc
 };
 
-void ShowIncomeGraph(void)
+void ShowIncomeGraph()
 {
 	if (AllocateWindowDescFront(&_income_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
@@ -550,7 +550,7 @@
 	DeliveredCargoGraphWndProc
 };
 
-void ShowDeliveredCargoGraph(void)
+void ShowDeliveredCargoGraph()
 {
 	if (AllocateWindowDescFront(&_delivered_cargo_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
@@ -619,7 +619,7 @@
 	PerformanceHistoryWndProc
 };
 
-void ShowPerformanceHistoryGraph(void)
+void ShowPerformanceHistoryGraph()
 {
 	if (AllocateWindowDescFront(&_performance_history_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
@@ -686,7 +686,7 @@
 	CompanyValueGraphWndProc
 };
 
-void ShowCompanyValueGraph(void)
+void ShowCompanyValueGraph()
 {
 	if (AllocateWindowDescFront(&_company_value_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
@@ -784,7 +784,7 @@
 };
 
 
-void ShowCargoPaymentRates(void)
+void ShowCargoPaymentRates()
 {
 	Window *w = AllocateWindowDescFront(&_cargo_payment_rates_desc, 0);
 	if (w == NULL) return;
@@ -905,7 +905,7 @@
 	CompanyLeagueWndProc
 };
 
-void ShowCompanyLeagueTable(void)
+void ShowCompanyLeagueTable()
 {
 	AllocateWindowDescFront(&_company_league_desc,0);
 }
@@ -1144,7 +1144,7 @@
 	PerformanceRatingDetailWndProc
 };
 
-void ShowPerformanceRatingDetail(void)
+void ShowPerformanceRatingDetail()
 {
 	AllocateWindowDescFront(&_performance_rating_detail_desc, 0);
 }

--- a/src/gui.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/gui.h	Wed Mar 07 11:47:46 2007 +0000
@@ -10,31 +10,31 @@
 #include "string.h"
 
 /* main_gui.cpp */
-void SetupColorsAndInitialWindow(void);
+void SetupColorsAndInitialWindow();
 void CcPlaySound10(bool success, TileIndex tile, uint32 p1, uint32 p2);
 void CcBuildCanal(bool success, TileIndex tile, uint32 p1, uint32 p2);
 void CcTerraform(bool success, TileIndex tile, uint32 p1, uint32 p2);
 
 /* settings_gui.cpp */
-void ShowGameOptions(void);
-void ShowGameDifficulty(void);
-void ShowPatchesSelection(void);
+void ShowGameOptions();
+void ShowGameDifficulty();
+void ShowPatchesSelection();
 void DrawArrowButtons(int x, int y, int ctab, byte state, bool clickable_left, bool clickable_right);
 
 /* graph_gui.cpp */
-void ShowOperatingProfitGraph(void);
-void ShowIncomeGraph(void);
-void ShowDeliveredCargoGraph(void);
-void ShowPerformanceHistoryGraph(void);
-void ShowCompanyValueGraph(void);
-void ShowCargoPaymentRates(void);
-void ShowCompanyLeagueTable(void);
-void ShowPerformanceRatingDetail(void);
+void ShowOperatingProfitGraph();
+void ShowIncomeGraph();
+void ShowDeliveredCargoGraph();
+void ShowPerformanceHistoryGraph();
+void ShowCompanyValueGraph();
+void ShowCargoPaymentRates();
+void ShowCompanyLeagueTable();
+void ShowPerformanceRatingDetail();
 
 /* news_gui.cpp */
-void ShowLastNewsMessage(void);
-void ShowMessageOptions(void);
-void ShowMessageHistory(void);
+void ShowLastNewsMessage();
+void ShowMessageOptions();
+void ShowMessageHistory();
 
 /* rail_gui.cpp */
 void ShowBuildRailToolbar(RailType railtype, int button);
@@ -46,23 +46,23 @@
 void ShowOrdersWindow(const Vehicle *v);
 
 /* road_gui.cpp */
-void ShowBuildRoadToolbar(void);
-void ShowBuildRoadScenToolbar(void);
+void ShowBuildRoadToolbar();
+void ShowBuildRoadScenToolbar();
 void ShowRoadVehViewWindow(const Vehicle *v);
 
 /* dock_gui.cpp */
-void ShowBuildDocksToolbar(void);
+void ShowBuildDocksToolbar();
 void ShowShipViewWindow(const Vehicle *v);
 
 /* aircraft_gui.cpp */
-void ShowBuildAirToolbar(void);
+void ShowBuildAirToolbar();
 
 /* terraform_gui.cpp */
 void ShowTerraformToolbar(Window *link = NULL);
 
 /* tgp_gui.cpp */
-void ShowGenerateLandscape(void);
-void ShowHeightmapLoad(void);
+void ShowGenerateLandscape();
+void ShowHeightmapLoad();
 
 void PlaceProc_DemolishArea(TileIndex tile);
 void PlaceProc_LevelLand(TileIndex tile);
@@ -78,13 +78,13 @@
 };
 
 /* misc_gui.cpp */
-void PlaceLandBlockInfo(void);
-void ShowAboutWindow(void);
-void ShowBuildTreesToolbar(void);
-void ShowBuildTreesScenToolbar(void);
-void ShowTownDirectory(void);
-void ShowIndustryDirectory(void);
-void ShowSubsidiesList(void);
+void PlaceLandBlockInfo();
+void ShowAboutWindow();
+void ShowBuildTreesToolbar();
+void ShowBuildTreesScenToolbar();
+void ShowTownDirectory();
+void ShowIndustryDirectory();
+void ShowSubsidiesList();
 void ShowPlayerStations(PlayerID player);
 void ShowPlayerFinances(PlayerID player);
 void ShowPlayerCompany(PlayerID player);
@@ -95,13 +95,13 @@
 void DrawStationCoverageAreaText(int sx, int sy, uint mask,int rad);
 void CheckRedrawStationCoverage(const Window *w);
 
-void ShowSmallMap(void);
-void ShowExtraViewPortWindow(void);
+void ShowSmallMap();
+void ShowExtraViewPortWindow();
 void SetVScrollCount(Window *w, int num);
 void SetVScroll2Count(Window *w, int num);
 void SetHScrollCount(Window *w, int num);
 
-void ShowCheatWindow(void);
+void ShowCheatWindow();
 
 void DrawEditBox(Window *w, querystr_d *string, int wid);
 void HandleEditBox(Window *w, querystr_d *string, int wid);
@@ -116,7 +116,7 @@
 void InitializeTextBuffer(Textbuf *tb, const char *buf, uint16 maxlength, uint16 maxwidth);
 void UpdateTextBufferSize(Textbuf *tb);
 
-void BuildFileList(void);
+void BuildFileList();
 void SetFiosType(const byte fiostype);
 
 /* FIOS_TYPE_FILE, FIOS_TYPE_OLDFILE etc. different colours */
@@ -125,10 +125,10 @@
 /* bridge_gui.cpp */
 void ShowBuildBridgeWindow(uint start, uint end, byte type);
 
-void ShowBuildIndustryWindow(void);
+void ShowBuildIndustryWindow();
 void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, Window *parent, CharSetFilter afilter);
 void ShowQuery(StringID caption, StringID message, Window *w, void (*callback)(Window*, bool));
-void ShowMusicWindow(void);
+void ShowMusicWindow();
 
 /* main_gui.cpp */
 void HandleOnEditText(const char *str);
@@ -136,6 +136,6 @@
 VARDEF PlaceProc *_place_proc;
 
 /* vehicle_gui.cpp */
-void InitializeGUI(void);
+void InitializeGUI();
 
 #endif /* GUI_H */

--- a/src/hal.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/hal.h	Wed Mar 07 11:47:46 2007 +0000
@@ -7,30 +7,30 @@
 
 typedef struct {
 	const char *(*start)(const char * const *parm);
-	void (*stop)(void);
+	void (*stop)();
 } HalCommonDriver;
 
 typedef struct {
 	const char *(*start)(const char * const *parm);
-	void (*stop)(void);
+	void (*stop)();
 	void (*make_dirty)(int left, int top, int width, int height);
-	void (*main_loop)(void);
+	void (*main_loop)();
 	bool (*change_resolution)(int w, int h);
 	void (*toggle_fullscreen)(bool fullscreen);
 } HalVideoDriver;
 
 typedef struct {
 	const char *(*start)(const char * const *parm);
-	void (*stop)(void);
+	void (*stop)();
 } HalSoundDriver;
 
 typedef struct {
 	const char *(*start)(const char * const *parm);
-	void (*stop)(void);
+	void (*stop)();
 
 	void (*play_song)(const char *filename);
-	void (*stop_song)(void);
-	bool (*is_song_playing)(void);
+	void (*stop_song)();
+	bool (*is_song_playing)();
 	void (*set_volume)(byte vol);
 } HalMusicDriver;
 

--- a/src/heightmap.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/heightmap.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -353,7 +353,7 @@
  * This function takes care of the fact that land in OpenTTD can never differ
  * more than 1 in height
  */
-static void FixSlopes(void)
+static void FixSlopes()
 {
 	uint width, height;
 	uint row, col;

--- a/src/industry.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/industry.h	Wed Mar 07 11:47:46 2007 +0000
@@ -111,7 +111,7 @@
 
 VARDEF int _total_industries; //general counter
 
-static inline IndustryID GetMaxIndustryIndex(void)
+static inline IndustryID GetMaxIndustryIndex()
 {
 	/* TODO - This isn't the real content of the function, but
 	 *  with the new pool-system this will be replaced with one that
@@ -121,7 +121,7 @@
 	return GetIndustryPoolSize() - 1;
 }
 
-static inline uint GetNumIndustries(void)
+static inline uint GetNumIndustries()
 {
 	return _total_industries;
 }
@@ -129,7 +129,7 @@
 /**
  * Return a random valid industry.
  */
-static inline Industry *GetRandomIndustry(void)
+static inline Industry *GetRandomIndustry()
 {
 	int num = RandomRange(GetNumIndustries());
 	IndustryID index = INVALID_INDUSTRY;

--- a/src/industry_cmd.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/industry_cmd.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -985,7 +985,7 @@
 	}
 }
 
-void OnTick_Industry(void)
+void OnTick_Industry()
 {
 	Industry *i;
 
@@ -1355,7 +1355,7 @@
 	return true;
 }
 
-static Industry *AllocateIndustry(void)
+static Industry *AllocateIndustry()
 {
 	Industry *i;
 
@@ -1582,7 +1582,7 @@
 	}
 }
 
-void GenerateIndustries(void)
+void GenerateIndustries()
 {
 	const byte *b;
 	uint i = 0;
@@ -1824,7 +1824,7 @@
 	}
 }
 
-void IndustryMonthlyLoop(void)
+void IndustryMonthlyLoop()
 {
 	Industry *i;
 	PlayerID old_player = _current_player;
@@ -1850,7 +1850,7 @@
 }
 
 
-void InitializeIndustries(void)
+void InitializeIndustries()
 {
 	CleanPool(&_Industry_pool);
 	AddBlockToPool(&_Industry_pool);
@@ -1908,7 +1908,7 @@
 	SLE_END()
 };
 
-static void Save_INDY(void)
+static void Save_INDY()
 {
 	Industry *ind;
 
@@ -1919,7 +1919,7 @@
 	}
 }
 
-static void Load_INDY(void)
+static void Load_INDY()
 {
 	int index;
 

--- a/src/industry_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/industry_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -271,7 +271,7 @@
 	},
 };
 
-void ShowBuildIndustryWindow(void)
+void ShowBuildIndustryWindow()
 {
 	if (!IsValidPlayer(_current_player)) return;
 	AllocateWindowDescFront(_industry_window_desc[_patches.build_rawmaterial_ind][_opt_ptr->landscape],0);
@@ -561,7 +561,7 @@
  * starts a new game without industries after playing a game with industries
  * the list is not populated with invalid industries from the previous game.
  */
-static void MakeSortedIndustryList(void)
+static void MakeSortedIndustryList()
 {
 	const Industry* i;
 	int n = 0;
@@ -690,7 +690,7 @@
 };
 
 
-void ShowIndustryDirectory(void)
+void ShowIndustryDirectory()
 {
 	Window *w = AllocateWindowDescFront(&_industry_directory_desc, 0);
 

--- a/src/intro_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/intro_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -99,7 +99,7 @@
 	SelectGameWndProc
 };
 
-void ShowSelectGameWindow(void)
+void ShowSelectGameWindow()
 {
 	AllocateWindowDesc(&_select_game_desc);
 }
@@ -109,7 +109,7 @@
 	if (confirmed) _exit_game = true;
 }
 
-void AskExitGame(void)
+void AskExitGame()
 {
 #if defined(_WIN32)
 		SetDParam(0, STR_0133_WINDOWS);
@@ -142,7 +142,7 @@
 	if (confirmed) _switch_mode = SM_MENU;
 }
 
-void AskExitToGameMenu(void)
+void AskExitToGameMenu()
 {
 	ShowQuery(
 		STR_0161_QUIT_GAME,

--- a/src/landscape.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/landscape.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -379,7 +379,7 @@
 #define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << MapLogX()))
 #define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS)
 
-void RunTileLoop(void)
+void RunTileLoop()
 {
 	TileIndex tile;
 	uint count;
@@ -405,7 +405,7 @@
 	_cur_tileloop_tile = tile;
 }
 
-void InitializeLandscape(void)
+void InitializeLandscape()
 {
 	uint maxx = MapMaxX();
 	uint maxy = MapMaxY();
@@ -425,7 +425,7 @@
 	for (x = 0; x < sizex; x++) MakeVoid(sizex * y + x);
 }
 
-void ConvertGroundTilesIntoWaterTiles(void)
+void ConvertGroundTilesIntoWaterTiles()
 {
 	TileIndex tile;
 	uint z;
@@ -587,7 +587,7 @@
 
 #include "table/genland.h"
 
-static void CreateDesertOrRainForest(void)
+static void CreateDesertOrRainForest()
 {
 	TileIndex tile;
 	TileIndex update_freq = MapSize() / 4;
@@ -697,15 +697,15 @@
 	if (_opt.landscape == LT_DESERT) CreateDesertOrRainForest();
 }
 
-void OnTick_Town(void);
-void OnTick_Trees(void);
-void OnTick_Station(void);
-void OnTick_Industry(void);
+void OnTick_Town();
+void OnTick_Trees();
+void OnTick_Station();
+void OnTick_Industry();
 
-void OnTick_Players(void);
-void OnTick_Train(void);
+void OnTick_Players();
+void OnTick_Train();
 
-void CallLandscapeTick(void)
+void CallLandscapeTick()
 {
 	OnTick_Town();
 	OnTick_Trees();

--- a/src/lzoconf.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/lzoconf.h	Wed Mar 07 11:47:46 2007 +0000
@@ -29,8 +29,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
+   <markus@oberhumer.com>   http://www.oberhumer.com/opensource/lzo/
  */
 
 
@@ -407,11 +406,11 @@
 LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
 
 /* version functions (useful for shared libraries) */
-LZO_EXTERN(unsigned) lzo_version(void);
-LZO_EXTERN(const char *) lzo_version_string(void);
-LZO_EXTERN(const char *) lzo_version_date(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
+LZO_EXTERN(unsigned) lzo_version();
+LZO_EXTERN(const char *) lzo_version_string();
+LZO_EXTERN(const char *) lzo_version_date();
+LZO_EXTERN(const lzo_charp) _lzo_version_string();
+LZO_EXTERN(const lzo_charp) _lzo_version_date();
 
 /* string functions */
 LZO_EXTERN(int)
@@ -431,7 +430,7 @@
 
 /* misc. */
 LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
-LZO_EXTERN(int) _lzo_config_check(void);
+LZO_EXTERN(int) _lzo_config_check();
 typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
 typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
 typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t;

--- a/src/main_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/main_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -52,8 +52,8 @@
 RailType _last_built_railtype;
 static int _scengen_town_size = 2; // depress medium-sized towns per default
 
-extern void GenerateIndustries(void);
-extern bool GenerateTowns(void);
+extern void GenerateIndustries();
+extern bool GenerateTowns();
 
 
 void HandleOnEditText(const char *str)
@@ -337,7 +337,7 @@
 	ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, 30, 180, NULL, CS_ALPHANUMERAL);
 }
 
-static void SelectSignTool(void)
+static void SelectSignTool()
 {
 	if (_cursor.sprite == SPR_CURSOR_SIGN) {
 		ResetObjectToPlace();
@@ -370,12 +370,12 @@
 	}
 }
 
-static void MenuClickSmallScreenshot(void)
+static void MenuClickSmallScreenshot()
 {
 	SetScreenshotType(SC_VIEWPORT);
 }
 
-static void MenuClickWorldScreenshot(void)
+static void MenuClickWorldScreenshot()
 {
 	SetScreenshotType(SC_WORLD);
 }
@@ -1379,7 +1379,7 @@
 	ScenEditLandGenWndProc,
 };
 
-static inline void ShowEditorTerraformToolBar(void)
+static inline void ShowEditorTerraformToolBar()
 {
 	AllocateWindowDescFront(&_scen_edit_land_gen_desc, 0);
 }
@@ -1593,7 +1593,7 @@
 };
 
 
-static bool AnyTownExists(void)
+static bool AnyTownExists()
 {
 	const Town *t;
 
@@ -2235,7 +2235,7 @@
 	StatusBarWndProc
 };
 
-extern void UpdateAllStationVirtCoord(void);
+extern void UpdateAllStationVirtCoord();
 
 static void MainWindowWndProc(Window *w, WindowEvent *e)
 {
@@ -2401,9 +2401,9 @@
 }
 
 
-void ShowSelectGameWindow(void);
-
-void SetupColorsAndInitialWindow(void)
+void ShowSelectGameWindow();
+
+void SetupColorsAndInitialWindow()
 {
 	uint i;
 	Window *w;
@@ -2436,7 +2436,7 @@
 	}
 }
 
-void ShowVitalWindows(void)
+void ShowVitalWindows()
 {
 	Window *w;
 
@@ -2461,7 +2461,7 @@
 	WP(w,def_d).data_1 = -1280;
 }
 
-void GameSizeChanged(void)
+void GameSizeChanged()
 {
 	_cur_resolution[0] = _screen.width;
 	_cur_resolution[1] = _screen.height;
@@ -2470,7 +2470,7 @@
 	MarkWholeScreenDirty();
 }
 
-void InitializeMainGui(void)
+void InitializeMainGui()
 {
 	/* Clean old GUI values */
 	_last_built_railtype = RAILTYPE_RAIL;

--- a/src/map.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/map.h	Wed Mar 07 11:47:46 2007 +0000
@@ -33,15 +33,15 @@
 void AllocateMap(uint size_x, uint size_y);
 
 /* binary logarithm of the map size, try to avoid using this one */
-static inline uint MapLogX(void)  { return _map_log_x; }
+static inline uint MapLogX()  { return _map_log_x; }
 /* The size of the map */
-static inline uint MapSizeX(void) { return _map_size_x; }
-static inline uint MapSizeY(void) { return _map_size_y; }
+static inline uint MapSizeX() { return _map_size_x; }
+static inline uint MapSizeY() { return _map_size_y; }
 /* The maximum coordinates */
-static inline uint MapMaxX(void) { return _map_size_x - 1; }
-static inline uint MapMaxY(void) { return _map_size_y - 1; }
+static inline uint MapMaxX() { return _map_size_x - 1; }
+static inline uint MapMaxY() { return _map_size_y - 1; }
 /* The number of tiles in the map */
-static inline uint MapSize(void) { return _map_size; }
+static inline uint MapSize() { return _map_size; }
 
 /* Scale a number relative to the map size */
 uint ScaleByMapSize(uint); // Scale relative to the number of tiles

--- a/src/mersenne.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/mersenne.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -32,7 +32,7 @@
  }
 
 
-static uint32 ReloadMT(void)
+static uint32 ReloadMT()
  {
     register uint32 *p0=_mt_state, *p2=_mt_state+2, *pM=_mt_state+M, s0, s1;
     register int    j;
@@ -56,7 +56,7 @@
  }
 
 
-uint32 RandomMT(void)
+uint32 RandomMT()
 {
 	uint32 y;
 

--- a/src/minilzo.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/minilzo.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -270,7 +270,7 @@
 
 __LZO_EXTERN_C int __lzo_init_done;
 __LZO_EXTERN_C const lzo_byte __lzo_copyright[];
-LZO_EXTERN(const lzo_byte *) lzo_copyright(void);
+LZO_EXTERN(const lzo_byte *) lzo_copyright();
 __LZO_EXTERN_C const lzo_uint32 _lzo_crc32_table[256];
 
 #define _LZO_STRINGIZE(x)		   #x
@@ -709,7 +709,7 @@
 
 #define IS_POWER_OF_2(x)		(((x) & ((x) - 1)) == 0)
 
-// static lzo_bool schedule_insns_bug(void);
+// static lzo_bool schedule_insns_bug();
 // static lzo_bool strength_reduce_bug(int *);
 
 #if 0 || defined(LZO_DEBUG)

--- a/src/misc.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/misc.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -29,7 +29,7 @@
 #include "network/network_data.h"
 uint32 DoRandom(int line, const char *file)
 #else // RANDOM_DEBUG
-uint32 Random(void)
+uint32 Random()
 #endif // RANDOM_DEBUG
 {
 
@@ -61,7 +61,7 @@
 #endif
 
 
-uint32 InteractiveRandom(void)
+uint32 InteractiveRandom()
 {
 	uint32 t = _random_seeds[1][1];
 	uint32 s = _random_seeds[1][0];
@@ -74,27 +74,27 @@
 	return GB(InteractiveRandom(), 0, 16) * max >> 16;
 }
 
-void InitializeVehicles(void);
-void InitializeWaypoints(void);
-void InitializeDepots(void);
-void InitializeEngines(void);
-void InitializeOrders(void);
-void InitializeClearLand(void);
-void InitializeRailGui(void);
-void InitializeRoadGui(void);
-void InitializeAirportGui(void);
-void InitializeDockGui(void);
-void InitializeIndustries(void);
-void InitializeMainGui(void);
-void InitializeLandscape(void);
-void InitializeTowns(void);
-void InitializeTrees(void);
-void InitializeSigns(void);
-void InitializeStations(void);
-static void InitializeNameMgr(void);
-void InitializePlayers(void);
-static void InitializeCheats(void);
-void InitializeNPF(void);
+void InitializeVehicles();
+void InitializeWaypoints();
+void InitializeDepots();
+void InitializeEngines();
+void InitializeOrders();
+void InitializeClearLand();
+void InitializeRailGui();
+void InitializeRoadGui();
+void InitializeAirportGui();
+void InitializeDockGui();
+void InitializeIndustries();
+void InitializeMainGui();
+void InitializeLandscape();
+void InitializeTowns();
+void InitializeTrees();
+void InitializeSigns();
+void InitializeStations();
+static void InitializeNameMgr();
+void InitializePlayers();
+static void InitializeCheats();
+void InitializeNPF();
 
 void InitializeGame(int mode, uint size_x, uint size_y)
 {
@@ -170,13 +170,13 @@
 }
 
 
-static void InitializeCheats(void)
+static void InitializeCheats()
 {
 	memset(&_cheats, 0, sizeof(Cheats));
 }
 
 
-static void InitializeNameMgr(void)
+static void InitializeNameMgr()
 {
 	memset(_name_array, 0, sizeof(_name_array));
 }
@@ -204,7 +204,7 @@
 	}
 }
 
-void ConvertNameArray(void)
+void ConvertNameArray()
 {
 	uint i;
 
@@ -267,7 +267,7 @@
 }
 
 
-static void Save_NAME(void)
+static void Save_NAME()
 {
 	int i;
 
@@ -279,7 +279,7 @@
 	}
 }
 
-static void Load_NAME(void)
+static void Load_NAME()
 {
 	int index;
 
@@ -314,7 +314,7 @@
 
 /* Save load date related variables as well as persistent tick counters
  * XXX: currently some unrelated stuff is just put here */
-static void SaveLoad_DATE(void)
+static void SaveLoad_DATE()
 {
 	SlGlobList(_date_desc);
 }
@@ -329,7 +329,7 @@
 	    SLEG_END()
 };
 
-static void SaveLoad_VIEW(void)
+static void SaveLoad_VIEW()
 {
 	SlGlobList(_view_desc);
 }
@@ -343,20 +343,20 @@
 	    SLEG_END()
 };
 
-static void Save_MAPS(void)
+static void Save_MAPS()
 {
 	_map_dim_x = MapSizeX();
 	_map_dim_y = MapSizeY();
 	SlGlobList(_map_dimensions);
 }
 
-static void Load_MAPS(void)
+static void Load_MAPS()
 {
 	SlGlobList(_map_dimensions);
 	AllocateMap(_map_dim_x, _map_dim_y);
 }
 
-static void Load_MAPT(void)
+static void Load_MAPT()
 {
 	uint size = MapSize();
 	uint i;
@@ -370,7 +370,7 @@
 	}
 }
 
-static void Save_MAPT(void)
+static void Save_MAPT()
 {
 	uint size = MapSize();
 	uint i;
@@ -385,7 +385,7 @@
 	}
 }
 
-static void Load_MAP1(void)
+static void Load_MAP1()
 {
 	uint size = MapSize();
 	uint i;
@@ -399,7 +399,7 @@
 	}
 }
 
-static void Save_MAP1(void)
+static void Save_MAP1()
 {
 	uint size = MapSize();
 	uint i;
@@ -414,7 +414,7 @@
 	}
 }
 
-static void Load_MAP2(void)
+static void Load_MAP2()
 {
 	uint size = MapSize();
 	uint i;
@@ -431,7 +431,7 @@
 	}
 }
 
-static void Save_MAP2(void)
+static void Save_MAP2()
 {
 	uint size = MapSize();
 	uint i;
@@ -446,7 +446,7 @@
 	}
 }
 
-static void Load_MAP3(void)
+static void Load_MAP3()
 {
 	uint size = MapSize();
 	uint i;
@@ -460,7 +460,7 @@
 	}
 }
 
-static void Save_MAP3(void)
+static void Save_MAP3()
 {
 	uint size = MapSize();
 	uint i;
@@ -475,7 +475,7 @@
 	}
 }
 
-static void Load_MAP4(void)
+static void Load_MAP4()
 {
 	uint size = MapSize();
 	uint i;
@@ -489,7 +489,7 @@
 	}
 }
 
-static void Save_MAP4(void)
+static void Save_MAP4()
 {
 	uint size = MapSize();
 	uint i;
@@ -504,7 +504,7 @@
 	}
 }
 
-static void Load_MAP5(void)
+static void Load_MAP5()
 {
 	uint size = MapSize();
 	uint i;
@@ -518,7 +518,7 @@
 	}
 }
 
-static void Save_MAP5(void)
+static void Save_MAP5()
 {
 	uint size = MapSize();
 	uint i;
@@ -533,7 +533,7 @@
 	}
 }
 
-static void Load_MAP6(void)
+static void Load_MAP6()
 {
 	/* Still available for loading old games */
 	uint size = MapSize();
@@ -563,7 +563,7 @@
 	}
 }
 
-static void Save_MAP6(void)
+static void Save_MAP6()
 {
 	uint size = MapSize();
 	uint i;
@@ -579,7 +579,7 @@
 }
 
 
-static void Save_CHTS(void)
+static void Save_CHTS()
 {
 	byte count = sizeof(_cheats)/sizeof(Cheat);
 	Cheat* cht = (Cheat*) &_cheats;
@@ -592,7 +592,7 @@
 	}
 }
 
-static void Load_CHTS(void)
+static void Load_CHTS()
 {
 	Cheat* cht = (Cheat*)&_cheats;
 	uint count = SlGetFieldLength() / 2;

--- a/src/misc/autoptr.hpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/misc/autoptr.hpp	Wed Mar 07 11:47:46 2007 +0000
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 #ifndef AUTOPTR_HPP
 #define AUTOPTR_HPP

--- a/src/misc_gui.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/misc_gui.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -191,7 +191,7 @@
 #undef LANDINFOD_LEVEL
 }
 
-void PlaceLandBlockInfo(void)
+void PlaceLandBlockInfo()
 {
 	if (_cursor.sprite == SPR_CURSOR_QUERY) {
 		ResetObjectToPlace();
@@ -305,7 +305,7 @@
 };
 
 
-void ShowAboutWindow(void)
+void ShowAboutWindow()
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
 	AllocateWindowDesc(&_about_desc);
@@ -466,13 +466,13 @@
 };
 
 
-void ShowBuildTreesToolbar(void)
+void ShowBuildTreesToolbar()
 {
 	if (!IsValidPlayer(_current_player)) return;
 	AllocateWindowDescFront(&_build_trees_desc, 0);
 }
 
-void ShowBuildTreesScenToolbar(void)
+void ShowBuildTreesScenToolbar()
 {
 	AllocateWindowDescFront(&_build_trees_scen_desc, 0);
 }
@@ -1330,7 +1330,7 @@
 /* Colors for fios types */
 const byte _fios_colors[] = {13, 9, 9, 6, 5, 6, 5, 6, 6, 8};
 
-void BuildFileList(void)
+void BuildFileList()
 {
 	_fios_path_changed = true;
 	FiosFreeSavegameList();
@@ -1363,7 +1363,7 @@
 	DoDrawStringTruncated(path, 2, 27, 16, maxw);
 }
 
-static void MakeSortedSaveGameList(void)
+static void MakeSortedSaveGameList()
 {
 	uint sort_start = 0;
 	uint sort_end = 0;
@@ -1387,7 +1387,7 @@
 		qsort(_fios_list + sort_start, s_amount, sizeof(FiosItem), compare_FiosItems);
 }
 
-static void GenerateFileName(void)
+static void GenerateFileName()
 {
 	/* Check if we are not a specatator who wants to generate a name..
 	    Let's use the name of player #0 for now. */
@@ -1399,7 +1399,7 @@
 	GetString(_edit_str_buf, STR_4004, lastof(_edit_str_buf));
 }
 
-extern void StartupEngines(void);
+extern void StartupEngines();
 
 static void SaveLoadDlgWndProc(Window *w, WindowEvent *e)
 {
@@ -1663,7 +1663,7 @@
 	ResetObjectToPlace();
 }
 
-void RedrawAutosave(void)
+void RedrawAutosave()
 {
 	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
 }
@@ -1734,7 +1734,7 @@
 	return _opt.landscape;
 }
 
-extern void EnginesMonthlyLoop(void);
+extern void EnginesMonthlyLoop();
 
 /**
  * @param p2 1 (increase) or -1 (decrease)
@@ -1929,7 +1929,7 @@
 };
 
 
-void ShowCheatWindow(void)
+void ShowCheatWindow()
 {
 	DeleteWindowById(WC_CHEATS, 0);
 	AllocateWindowDesc(&_cheats_desc);

--- a/src/mixer.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/mixer.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -93,7 +93,7 @@
 	}
 }
 
-MixerChannel *MxAllocateChannel(void)
+MixerChannel *MxAllocateChannel()
 {
 	MixerChannel *mc;
 	for (mc = _channels; mc != endof(_channels); mc++)

--- a/src/mixer.h	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/mixer.h	Wed Mar 07 11:47:46 2007 +0000
@@ -17,7 +17,7 @@
 bool MxInitialize(uint rate);
 void MxMixSamples(void* buffer, uint samples);
 
-MixerChannel* MxAllocateChannel(void);
+MixerChannel* MxAllocateChannel();
 void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, uint size, uint rate, uint flags);
 void MxSetChannelVolume(MixerChannel *mc, uint left, uint right);
 void MxActivateChannel(MixerChannel*);

--- a/src/music/bemidi.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/music/bemidi.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -14,7 +14,7 @@
 	return NULL;
 }
 
-static void bemidi_stop(void)
+static void bemidi_stop()
 {
 	midiSynthFile.UnloadFile();
 }
@@ -28,12 +28,12 @@
 	midiSynthFile.Start();
 }
 
-static void bemidi_stop_song(void)
+static void bemidi_stop_song()
 {
 	midiSynthFile.UnloadFile();
 }
 
-static bool bemidi_is_playing(void)
+static bool bemidi_is_playing()
 {
 	return !midiSynthFile.IsFinished();
 }

--- a/src/music/dmusic.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/music/dmusic.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -107,7 +107,7 @@
 }
 
 
-static void DMusicMidiStop(void)
+static void DMusicMidiStop()
 {
 	seeking = false;
 
@@ -186,7 +186,7 @@
 }
 
 
-static void DMusicMidiStopSong(void)
+static void DMusicMidiStopSong()
 {
 	if (FAILED(performance->Stop(segment, NULL, 0, 0))) {
 		DEBUG(driver, 0, "DirectMusic: StopSegment failed");
@@ -195,7 +195,7 @@
 }
 
 
-static bool DMusicMidiIsSongPlaying(void)
+static bool DMusicMidiIsSongPlaying()
 {
 	/* Not the nicest code, but there is a short delay before playing actually
 	 * starts. OpenTTD makes no provision for this. */

--- a/src/music/extmidi.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/music/extmidi.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -21,8 +21,8 @@
 	pid_t pid;
 } _midi;
 
-static void DoPlay(void);
-static void DoStop(void);
+static void DoPlay();
+static void DoStop();
 
 static const char* ExtMidiStart(const char* const * parm)
 {
@@ -31,7 +31,7 @@
 	return NULL;
 }
 
-static void ExtMidiStop(void)
+static void ExtMidiStop()
 {
 	_midi.song[0] = '\0';
 	DoStop();
@@ -43,13 +43,13 @@
 	DoStop();
 }
 
-static void ExtMidiStopSong(void)
+static void ExtMidiStopSong()
 {
 	_midi.song[0] = '\0';
 	DoStop();
 }
 
-static bool ExtMidiIsPlaying(void)
+static bool ExtMidiIsPlaying()
 {
 	if (_midi.pid != -1 && waitpid(_midi.pid, NULL, WNOHANG) == _midi.pid)
 		_midi.pid = -1;
@@ -62,7 +62,7 @@
 	DEBUG(driver, 1, "extmidi: set volume not implemented");
 }
 
-static void DoPlay(void)
+static void DoPlay()
 {
 	_midi.pid = fork();
 	switch (_midi.pid) {
@@ -91,7 +91,7 @@
 	}
 }
 
-static void DoStop(void)
+static void DoStop()
 {
 	if (_midi.pid != -1) kill(_midi.pid, SIGTERM);
 }

--- a/src/music/libtimidity.cpp	Tue Mar 06 23:42:30 2007 +0000
+++ b/src/music/libtimidity.cpp	Wed Mar 07 11:47:46 2007 +0000
@@ -77,7 +77,7 @@
 	return NULL;
 }
 
-static void LibtimidityMidiStop(void)
+static void LibtimidityMidiStop()
 {
 	if (_midi.status == MIDI_PLAYING) {
 		_midi.status = MIDI_STOPPED;
@@ -107,13 +107,13 @@
 	_midi.status = MIDI_PLAYING;
 }
 
-static void LibtimidityMidiStopSong(void)
+static void LibtimidityMidiStopSong()
 {
 	_midi.status = MIDI_STOPPED;
 	mid_song_free(_midi.song);
 }
 
-static bool LibtimidityMidiIsPlaying(void)
+static bool LibtimidityMidiIsPlaying()
 {
 	if (_midi.status == MIDI_PLAYING) {
 		_midi.song_position = mid_song_get_time(_midi.song);