#1753070: Enable that makensis and its related utilities can be built natively for 64-bit systems

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6040 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/zip2exe/main.cpp

@@ -1,8 +1,19 @@
 #include <windows.h>
+#include <tchar.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <commctrl.h>
-#include "..\ExDLL\nsis_tchar.h"
+
+#ifndef _countof
+#ifndef __cplusplus
+#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#else
+  extern "C++" {
+    template <typename _CountofType,size_t _SizeOfArray> char (*__countof_helper(UNALIGNED _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray];
+#define _countof(_Array) sizeof(*__countof_helper(_Array))
+  }
+#endif
+#endif
 
 /*
 version 0.36