(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/fios.h b/src/fios.h
index 80654812b..51e0c275a 100644
--- a/src/fios.h
+++ b/src/fios.h
@@ -190,7 +190,7 @@ public:
 		this->files.Compact();
 	}
 
-	void BuildFileList(AbstractFileType abstract_filetype, FileOperation fop);
+	void BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperation fop);
 	const FiosItem *FindItem(const char *file);
 
 	SmallVector<FiosItem, 32> files; ///< The list of files.
@@ -207,11 +207,11 @@ DECLARE_ENUM_AS_BIT_SET(SortingBits)
 /* Variables to display file lists */
 extern SortingBits _savegame_sort_order;
 
-void ShowSaveLoadDialog(AbstractFileType abstract_filetype, FileOperation fop);
+void ShowSaveLoadDialog(AbstractFileType abstract_filetype, SaveLoadOperation fop);
 
-void FiosGetSavegameList(FileOperation fop, FileList &file_list);
-void FiosGetScenarioList(FileOperation fop, FileList &file_list);
-void FiosGetHeightmapList(FileOperation fop, FileList &file_list);
+void FiosGetSavegameList(SaveLoadOperation fop, FileList &file_list);
+void FiosGetScenarioList(SaveLoadOperation fop, FileList &file_list);
+void FiosGetHeightmapList(SaveLoadOperation fop, FileList &file_list);
 
 const char *FiosBrowseTo(const FiosItem *item);
 
@@ -220,7 +220,7 @@ bool FiosDelete(const char *name);
 void FiosMakeHeightmapName(char *buf, const char *name, const char *last);
 void FiosMakeSavegameName(char *buf, const char *name, const char *last);
 
-FiosType FiosGetSavegameListCallback(FileOperation fop, const char *file, const char *ext, char *title, const char *last);
+FiosType FiosGetSavegameListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last);
 
 int CDECL CompareFiosItems(const FiosItem *a, const FiosItem *b);