diff options
author | Niels Weber <niels.weber@digia.com> | 2013-05-03 13:17:25 +0200 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2013-05-06 13:38:50 +0200 |
commit | cb1e422a588457bc46aecac679fe20fcd5ad2444 (patch) | |
tree | 32ed7b6093f14b3b8988f5158b0fff789f1e2eb2 /src/libs/7zip/installer_framework_changes.txt | |
parent | 53d70144622f36c38b7559e6beb9cb79d4546096 (diff) |
Cleanup installer_framework_changes.txt
Change-Id: I96671be32c66befdaa61a90440e164c6eba6fc07
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/7zip/installer_framework_changes.txt')
-rw-r--r-- | src/libs/7zip/installer_framework_changes.txt | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/libs/7zip/installer_framework_changes.txt b/src/libs/7zip/installer_framework_changes.txt new file mode 100644 index 000000000..6b5839208 --- /dev/null +++ b/src/libs/7zip/installer_framework_changes.txt @@ -0,0 +1,54 @@ +There are deleted files and very small changes to get the integration process of new versions very simple. +--diff-filter=M means "modified" and +--diff-filter=D means "deleted" files + +=== output of: git diff --diff-filter=M === + +diff --git a/CPP/7zip/Common/RegisterArc.h b/CPP/7zip/Common/RegisterArc.h +index bc2a034..9b8cbd3 100644 +--- a/CPP/7zip/Common/RegisterArc.h ++++ b/CPP/7zip/Common/RegisterArc.h +@@ -27,6 +27,6 @@ void RegisterArc(const CArcInfo *arcInfo); + + #define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \ + REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \ +- static REGISTER_ARC_NAME(x) g_RegisterArc; +- ++ static REGISTER_ARC_NAME(x) g_RegisterArc; \ ++ void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; } + #endif +diff --git a/CPP/7zip/Common/RegisterCodec.h b/CPP/7zip/Common/RegisterCodec.h +index 786b4a4..d53c434 100644 +--- a/CPP/7zip/Common/RegisterCodec.h ++++ b/CPP/7zip/Common/RegisterCodec.h +@@ -22,12 +22,13 @@ void RegisterCodec(const CCodecInfo *codecInfo); + + #define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \ + REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \ +- static REGISTER_CODEC_NAME(x) g_RegisterCodec; ++ static REGISTER_CODEC_NAME(x) g_RegisterCodec; \ ++ void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; } + + #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x + #define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \ + REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \ + RegisterCodec(&g_CodecsInfo[i]); }}; \ +- static REGISTER_CODECS_NAME(x) g_RegisterCodecs; +- ++ static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \ ++ void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; } + #endif +diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h +index eb3c52d..f483e39 100644 +--- a/CPP/Common/MyString.h ++++ b/CPP/Common/MyString.h +@@ -7,6 +7,8 @@ + + #include "MyVector.h" + ++#include <windows.h> ++ + template <class T> + inline int MyStringLen(const T *s) + { + |