TCHAR cannot be used in RegTool because it must be able to run on Win9x.

RegTool now implements A and W functions in the same binary. Bitness mixing is still problematic.


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

Include/Library.nsh

@@ -121,6 +121,16 @@
   ;------------------------
   ;Setup RegTool
 
+  !ifdef NSIS_MAKENSIS64
+    !if "${NSIS_PTR_SIZE}" < 8
+      !error "Incompatible RegTool bitness, compile with 32-bit NSIS!" ; 64-bit RegTool on 32-bit Windows
+    !endif
+  !else
+    !if "${NSIS_PTR_SIZE}" > 4
+      !warning "Incompatible RegTool bitness!" ; 32-bit RegTool will probably fail to register 64-bit library
+    !endif
+  !endif
+
   ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "${REGTOOL_KEY}"
   StrCpy $R3 $R3 -4 1
   IfFileExists $R3 +3