VC6 cannot handle template class typedef of a template class with the same name (in a different namespace)

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

Contrib/Makensisw/makensisw.cpp

@@ -1334,4 +1334,3 @@ void SetCompressor(NCOMPRESSOR compressor)
     ResetObjects();
   }
 }
-

Contrib/Makensisw/utils.cpp

@@ -1135,4 +1135,4 @@ void EnableUICommand(UINT Id, INT_PTR Enabled)
 {
   EnableToolBarButton(Id, !!Enabled);
   EnableMenuItem(g_sdata.menu, Id, Enabled ? MF_ENABLED : MF_GRAYED);
-}
+}

Contrib/UserInfo/UserInfo.c

@@ -35,13 +35,7 @@ struct group
  TCHAR *name;
 };
 
-// Jim Park: Moved this array from inside the func to the outside.  While it
-// was probably "safe" for this array to be inside because the strings are in
-// the .data section and so the pointer to the string returned is probably
-// safe, this is a bad practice to have as that's making an assumption on what
-// the compiler will do.  Besides which, other types of data returned would
-// actually fail as the local vars would be popped off the stack.
-struct group groups[] = 
+static const struct group groups[] = 
 {
  {DOMAIN_ALIAS_RID_USERS, _T("User")},
  // every user belongs to the users group, hence users come before guests