From e06dcdcae60ed8c8d2535824d2411475e8e4618c Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 26 Apr 2007 18:24:35 +0000 Subject: [PATCH] fixed bug #1707823 - VS_FIXEDFILEINFO undefind in util.cpp git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5124 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Platform.h | 15 +++++++++++++++ Source/ResourceVersionInfo.h | 18 ------------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Source/Platform.h b/Source/Platform.h index 0e59b41e..b4abdf03 100644 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -849,6 +849,21 @@ typedef struct _IMAGE_EXPORT_DIRECTORY { DWORD AddressOfNames; DWORD AddressOfNameOrdinals; } IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; +typedef struct tagVS_FIXEDFILEINFO { + DWORD dwSignature; + DWORD dwStrucVersion; + DWORD dwFileVersionMS; + DWORD dwFileVersionLS; + DWORD dwProductVersionMS; + DWORD dwProductVersionLS; + DWORD dwFileFlagsMask; + DWORD dwFileFlags; + DWORD dwFileOS; + DWORD dwFileType; + DWORD dwFileSubtype; + DWORD dwFileDateMS; + DWORD dwFileDateLS; +} VS_FIXEDFILEINFO; # pragma pack() #endif diff --git a/Source/ResourceVersionInfo.h b/Source/ResourceVersionInfo.h index 90b583bd..1f1c5ecf 100644 --- a/Source/ResourceVersionInfo.h +++ b/Source/ResourceVersionInfo.h @@ -26,24 +26,6 @@ #include "Platform.h" #include "strlist.h" -#ifndef _WIN32 -// all definitions for non Win32 platforms were taken from MinGW's free Win32 library -typedef struct tagVS_FIXEDFILEINFO { - DWORD dwSignature; - DWORD dwStrucVersion; - DWORD dwFileVersionMS; - DWORD dwFileVersionLS; - DWORD dwProductVersionMS; - DWORD dwProductVersionLS; - DWORD dwFileFlagsMask; - DWORD dwFileFlags; - DWORD dwFileOS; - DWORD dwFileType; - DWORD dwFileSubtype; - DWORD dwFileDateMS; - DWORD dwFileDateLS; -} VS_FIXEDFILEINFO; -#endif struct version_string_list;