[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nsis-commits
Subject:    [NSIS-commits] SF.net SVN: nsis: [5616] NSIS/trunk
From:       joostverburg () users ! sourceforge ! net
Date:       2008-05-01 20:31:23
Message-ID: E1JrfR5-0001LW-Uz () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 5616
          http://nsis.svn.sourceforge.net/nsis/?rev=5616&view=rev
Author:   joostverburg
Date:     2008-05-01 13:31:23 -0700 (Thu, 01 May 2008)

Log Message:
-----------
check whether function from StrFunc.nsh is already included

Modified Paths:
--------------
    NSIS/trunk/Contrib/MultiUser/MultiUser.nsh
    NSIS/trunk/Include/StrFunc.nsh

Modified: NSIS/trunk/Contrib/MultiUser/MultiUser.nsh
===================================================================
--- NSIS/trunk/Contrib/MultiUser/MultiUser.nsh	2008-04-25 09:29:59 UTC (rev 5615)
+++ NSIS/trunk/Contrib/MultiUser/MultiUser.nsh	2008-05-01 20:31:23 UTC (rev 5616)
@@ -36,9 +36,13 @@
     !insertmacro un.GetParameters
   !endif
   !include StrFunc.nsh
-  ${StrStr}
+  !ifndef StrStr_INCLUDED
+    ${StrStr}
+  !endif
   !ifndef MULTIUSER_NOUNINSTALL
-    ${UnStrStr}
+    !ifndef UnStrStr_INCLUDED
+      ${UnStrStr}
+    !endif
   !endif
   
   Var MultiUser.Parameters

Modified: NSIS/trunk/Include/StrFunc.nsh
===================================================================
--- NSIS/trunk/Include/StrFunc.nsh	2008-04-25 09:29:59 UTC (rev 5615)
+++ NSIS/trunk/Include/StrFunc.nsh	2008-05-01 20:31:23 UTC (rev 5616)
@@ -85,12 +85,14 @@
       !echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - \xA9 \
                ${Credits}${STRFUNC_FUNCMSGPOST}`
       !verbose pop
       !define `Un${ShortName}` `!insertmacro FUNCTION_STRING_Un${ShortName}_Call`
+      !define `Un${ShortName}_INCLUDED`
       Function `un.${ShortName}`
     !else
       !echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - \xA9 \
                ${Credits}${STRFUNC_FUNCMSGPOST}`
       !verbose pop
       !undef `${ShortName}`
       !define `${ShortName}` `!insertmacro FUNCTION_STRING_${ShortName}_Call`
+      !define `${ShortName}_INCLUDED`
       Function `${ShortName}`
     !endif
   !macroend


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits


[prev in list] [next in list] [prev in thread] [next in thread]