From 82a87863ffa8335271be347645a8c7e271c88d79 Mon Sep 17 00:00:00 2001 From: dhewg Date: Sat, 7 Jan 2012 15:30:03 +0100 Subject: [PATCH] Rename FILE_[EXEC|OPEN] due to conflict Some MinGW versions already define it. --- neo/framework/FileSystem.h | 4 ++-- neo/framework/async/AsyncClient.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neo/framework/FileSystem.h b/neo/framework/FileSystem.h index 18d5cc68..d7188882 100644 --- a/neo/framework/FileSystem.h +++ b/neo/framework/FileSystem.h @@ -87,8 +87,8 @@ typedef enum { } dlStatus_t; typedef enum { - FILE_EXEC, - FILE_OPEN + DL_FILE_EXEC, + DL_FILE_OPEN } dlMime_t; typedef enum { diff --git a/neo/framework/async/AsyncClient.cpp b/neo/framework/async/AsyncClient.cpp index bf8c71df..41e174ec 100644 --- a/neo/framework/async/AsyncClient.cpp +++ b/neo/framework/async/AsyncClient.cpp @@ -2006,7 +2006,7 @@ void idAsyncClient::HandleDownloads( void ) { idStr fullPath = f->GetFullPath(); fileSystem->CloseFile( f ); if ( session->MessageBox( MSG_YESNO, common->GetLanguageDict()->GetString ( "#str_04331" ), common->GetLanguageDict()->GetString ( "#str_04332" ), true, "yes" )[0] ) { - if ( updateMime == FILE_EXEC ) { + if ( updateMime == DL_FILE_EXEC ) { sys->StartProcess( fullPath, true ); } else { sys->OpenURL( va( "file://%s", fullPath.c_str() ), true );