From 5ae69eb9cc7eaa45311cabd85322861ddcfcffd8 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 18 Aug 2014 20:20:55 +0000
Subject: [PATCH] zip2exe: The fix for bug #1085 causes a MSVC redefinition
 warning when <tchar.h> is included.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6540 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/zip2exe/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp
index 4a5f72a6..b43150cf 100644
--- a/Contrib/zip2exe/main.cpp
+++ b/Contrib/zip2exe/main.cpp
@@ -1,5 +1,6 @@
 
 #include "../../Source/Platform.h"
+#undef _tcsrchr // The fix for bug #1085 causes a MSVC redefinition warning when <tchar.h> is included by zlib/unzip.h -> zlib/ioapi.h.
 #include <windows.h>
 #include <tchar.h>
 #include <stdio.h>