mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Fix clang builds

Browse Source 
Redeclaring the same typedef is not legal in C < 11, but a
forward-declaration works just fine for having a pointer to struct. No
changes needed in .cpp, as it includes the `typedef` from `object.h`
(via `scenario.h`).
This commit is contained in:
Michał Janiszewski
2016-10-13 18:24:10 +02:00
committed by Ted John
parent f776527a2b
commit 00c47b8a04
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ScenarioRepository.h
View File

@@ -22,7 +22,7 @@
#define MAX_PATH 260
#endif
typedef struct rct_object_entry rct_object_entry;
struct rct_object_entry;
typedef struct scenario_highscore_entry
{
@@ -86,7 +86,7 @@ extern "C"
size_t scenario_repository_get_count();
const scenario_index_entry *scenario_repository_get_by_index(size_t index);
bool scenario_repository_try_record_highscore(const utf8 * scenarioFileName, money32 companyValue, const utf8 * name);
void scenario_translate(scenario_index_entry * scenarioEntry, const rct_object_entry * stexObjectEntry);
void scenario_translate(scenario_index_entry * scenarioEntry, const struct rct_object_entry * stexObjectEntry);
#ifdef __cplusplus
}

3
src/interface/window.h
View File

@@ -25,11 +25,10 @@
#include "../ride/track_design.h"
#include "../ride/vehicle.h"
#include "../scenario.h"
#include "../ScenarioRepository.h"
#include "../world/park.h"
#include "colour.h"
typedef struct scenario_index_entry scenario_index_entry;
struct rct_window;
union rct_window_event;
extern uint16 TextInputDescriptionArgs[4];