use new artificial functions to remove the need to declare usage of functions from the header files and to remove the unnecessary differentiation between install and uninstall functions

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

Include/Util.nsh

@@ -30,6 +30,27 @@
 !macroend
 !define CallArtificialFunction `!insertmacro CallArtificialFunction`
 
+# for usage of artificial functions inside artificial functions
+# macro recursion is prohibited
+!macro CallArtificialFunction2 NAME
+  !ifndef __UNINSTALL__
+    !define CallArtificialFunction2_TYPE inst
+  !else
+    !define CallArtificialFunction2_TYPE uninst
+  !endif
+  Call :.${NAME}${CallArtificialFunction2_TYPE}
+  !ifndef ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
+    Goto ${NAME}${CallArtificialFunction2_TYPE}_DONE
+    !define ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
+    .${NAME}${CallArtificialFunction2_TYPE}:
+      !insertmacro ${NAME}
+    Return
+    ${NAME}${CallArtificialFunction2_TYPE}_DONE:
+  !endif
+  !undef CallArtificialFunction2_TYPE
+!macroend
+!define CallArtificialFunction2 `!insertmacro CallArtificialFunction2`
+
 !endif # !___UTIL__NSH___
 
 !verbose pop