mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[misc] fix MinGW/gcc 10.x multiple definition errors
This commit is contained in:
parent
b3d35b27df
commit
56e87429d7
3 changed files with 9 additions and 9 deletions
|
@ -70,7 +70,7 @@ PF_TYPE_DECL(NTAPI, NTSTATUS, NtQueryVolumeInformationFile, (HANDLE, PIO_STATUS_
|
|||
* Globals
|
||||
*/
|
||||
RUFUS_DRIVE_INFO SelectedDrive;
|
||||
BOOL installed_uefi_ntfs;
|
||||
extern BOOL installed_uefi_ntfs;
|
||||
uint64_t partition_offset[3];
|
||||
uint64_t persistence_size = 0;
|
||||
|
||||
|
|
|
@ -148,9 +148,9 @@ typedef struct loc_dlg_list_struct {
|
|||
extern const loc_parse parse_cmd[7];
|
||||
extern struct list_head locale_list;
|
||||
extern char *default_msg_table[], *current_msg_table[], **msg_table;
|
||||
int loc_line_nr;
|
||||
char *loc_filename, *embedded_loc_filename;
|
||||
BOOL en_msg_mode;
|
||||
extern int loc_line_nr;
|
||||
extern char *loc_filename, *embedded_loc_filename;
|
||||
extern BOOL en_msg_mode;
|
||||
|
||||
void free_loc_cmd(loc_cmd* lcmd);
|
||||
BOOL dispatch_loc_cmd(loc_cmd* lcmd);
|
||||
|
|
10
src/rufus.rc
10
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.10.1655"
|
||||
CAPTION "Rufus 3.10.1656"
|
||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||
|
@ -395,8 +395,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,10,1655,0
|
||||
PRODUCTVERSION 3,10,1655,0
|
||||
FILEVERSION 3,10,1656,0
|
||||
PRODUCTVERSION 3,10,1656,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -414,13 +414,13 @@ BEGIN
|
|||
VALUE "Comments", "https://rufus.ie"
|
||||
VALUE "CompanyName", "Akeo Consulting"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "3.10.1655"
|
||||
VALUE "FileVersion", "3.10.1656"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||
VALUE "OriginalFilename", "rufus-3.10.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "3.10.1655"
|
||||
VALUE "ProductVersion", "3.10.1656"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
Loading…
Reference in a new issue