From a696e041e1c0bb5ae34a47ddc3ec74a23a5d38f4 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 2 May 2019 16:03:15 +0100 Subject: [PATCH] [misc] fix MinGW compilation * Updated header was missing from previous commit --- src/format.h | 5 +++-- src/rufus.rc | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/format.h b/src/format.h index 663439f5..a8db8b51 100644 --- a/src/format.h +++ b/src/format.h @@ -2,7 +2,7 @@ * Rufus: The Reliable USB Formatting Utility * Formatting function calls * Copyright © 2007-2009 Tom Thornhill/Ridgecrop - * Copyright © 2011-2018 Pete Batard + * Copyright © 2011-2019 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * along with this program. If not, see . */ #include -#include // for MEDIA_TYPE +#include // for MEDIA_TYPE #include "ext2fs/ext2fs.h" @@ -170,3 +170,4 @@ typedef struct { } ext2fs_default_t; extern io_manager nt_io_manager(void); +extern DWORD ext2_last_winerror(DWORD default_error); diff --git a/src/rufus.rc b/src/rufus.rc index a58ef446..3fb70cb3 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.6.1530" +CAPTION "Rufus 3.6.1531" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1530,0 - PRODUCTVERSION 3,6,1530,0 + FILEVERSION 3,6,1531,0 + PRODUCTVERSION 3,6,1531,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.6.1530" + VALUE "FileVersion", "3.6.1531" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.6.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.6.1530" + VALUE "ProductVersion", "3.6.1531" END END BLOCK "VarFileInfo"