dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-20 01:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename FILE_[EXEC|OPEN] due to conflict

Browse source 
Some MinGW versions already define it.
This commit is contained in:
dhewg 2012-01-07 15:30:03 +01:00
parent 989b812a6e
commit 82a87863ff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/framework/FileSystem.h
View file

@ -87,8 +87,8 @@ typedef enum {
} dlStatus_t;
typedef enum {
FILE_EXEC,
FILE_OPEN
DL_FILE_EXEC,
DL_FILE_OPEN
} dlMime_t;
typedef enum {

2
neo/framework/async/AsyncClient.cpp
View file

@ -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 );