   
       nsMapiEntry *mMapiData ;
       // Container for the query threads
-*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	2003-02-25 22:36:33.000000000 +0100
---- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	2005-07-13 17:26:54.000000000 +0200
-***************
-*** 124,131 ****
-      nsCAutoString uri ;
-      nsCOMPtr<nsIRDFResource> resource ;
-  
-!     for (ULONG i = 0 ; i < folders.mNbEntries ; ++ i) {
-!         folders.mEntries [i].ToString(entryId) ;
-          buildAbWinUri(kOutlookDirectoryScheme, abType, uri) ;
-          uri.Append(entryId) ;
-          
---- 124,131 ----
-      nsCAutoString uri ;
-      nsCOMPtr<nsIRDFResource> resource ;
-  
-!     for (ULONG i = 0 ; i < folders.GetSize() ; ++ i) {
-!         folders[i].ToString(entryId) ;
-          buildAbWinUri(kOutlookDirectoryScheme, abType, uri) ;
-          uri.Append(entryId) ;
-          
-*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	2004-04-14 22:16:12.000000000 +0200
---- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	2005-07-13 17:26:54.000000000 +0200
+*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Wed Apr 14 16:16:12 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Tue Jan 10 17:55:24 2006
 ***************
 *** 41,46 ****
 --- 41,49 ----

         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
*** misc/mozilla/configure.in	2004-10-12 06:13:29.000000000 +0200
--- misc/build/mozilla/configure.in	2005-07-13 17:26:54.000000000 +0200
***************
*** 1536,1542 ****
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'

  CERT_DecodeDERCrl;
  CERT_DestroyCertificateRequest;
  CERT_DestroyCertList;
*** misc/mozilla/security/nss/lib/pki1/oiddata.h	Fri Jan  4 00:22:07 2002
--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h	Tue Jan 10 17:55:24 2006
***************
*** 39,49 ****
  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
  #endif /* DEBUG */
  
  #ifndef NSSPKI1T_H
  #include "nsspki1t.h"
  #endif /* NSSPKI1T_H */
  
! extern const NSSOID nss_builtin_oids[];
  extern const PRUint32 nss_builtin_oid_count;
  
  /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--- 39,50 ----
  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
  #endif /* DEBUG */
  
+ #include "pki1t.h"
  #ifndef NSSPKI1T_H
  #include "nsspki1t.h"
  #endif /* NSSPKI1T_H */
  
! extern const NSSOID *nss_builtin_oids;
  extern const PRUint32 nss_builtin_oid_count;
  
  /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
*** misc/mozilla/security/nss/lib/smime/config.mk	Fri Oct 15 19:52:34 2004
--- misc/build/mozilla/security/nss/lib/smime/config.mk	Tue Jan 10 17:55:24 2006
***************
*** 85,94 ****
  	../pkcs12 \
