 - 
   endif
 --- 78,81 ----
-*** misc/mozilla/xpfe/bootstrap/Makefile.in	2004-06-24 20:58:48.000000000 +0200
---- misc/build/mozilla/xpfe/bootstrap/Makefile.in	2005-07-14 12:34:56.000000000 +0200
-***************
-*** 84,94 ****
---- 84,97 ----
-  
-  include $(topsrcdir)/config/config.mk
-  
-+ # reduce prerequisites by disabling mozilla binary
-+ ifndef DISABLE_MOZ_EXECUTABLE
-  ifeq ($(USE_SHORT_LIBNAME),1)
-  PROGRAM		= mozilla$(BIN_SUFFIX)
-  else
-  PROGRAM		= mozilla-bin$(BIN_SUFFIX)
-  endif
-+ endif
-  
-  # Force applications to be built non-statically
-  # when building the mozcomps meta component
-*** misc/mozilla/security/nss/lib/pki1/oiddata.h	Sun Sep 11 15:57:15 2005
---- misc/build/mozilla/security/nss/lib/pki1/oiddata.h	Sat Sep 10 00:16:58 2005
-***************
-*** 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/xpcom/reflect/xptinfo/public/xptinfo.h	Sun Sep 11 16:02:28 2005
---- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Sat Sep 10 02:27:51 2005
-***************
-*** 132,138 ****
-          }
-  
-      PRBool IsArray() const
-!         {return (PRBool) TagPart() == T_ARRAY;}
-  
-      // 'Dependent' means that params of this type are dependent upon other 
-      // params. e.g. an T_INTERFACE_IS is dependent upon some other param at 
---- 132,138 ----
-          }
-  
-      PRBool IsArray() const
-!         {return (PRBool) (TagPart() == T_ARRAY);}
-  
-      // 'Dependent' means that params of this type are dependent upon other 
-      // params. e.g. an T_INTERFACE_IS is dependent upon some other param at 
-***************
-*** 152,158 ****
-      uint8 TagPart() const
-          {return (uint8) (flags & XPT_TDP_TAGMASK);}
-  
-!     enum
-      {
-          T_I8                = TD_INT8             ,
-          T_I16               = TD_INT16            ,
---- 152,158 ----
-      uint8 TagPart() const
-          {return (uint8) (flags & XPT_TDP_TAGMASK);}
-  
-!     enum _xpttype
-      {
-          T_I8                = TD_INT8             ,
-          T_I16               = TD_INT16            ,
-*** misc/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Thu Sep  2 01:45:24 2004
---- misc/build/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Sat Nov  5 22:45:54 2005
-***************
-*** 834,841 ****
-  void
-  nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
-  {
-!     PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
-!     PRUint16 value =  PRUint32(param) & 0x0000FFFF;
-  
-      switch (name) {
-      case MAX_CONNECTIONS:
---- 834,841 ----
-  void
-  nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
-  {
-!     PRUint16 name  = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
-!     PRUint16 value =  NS_PTR_TO_INT32(param) & 0x0000FFFF;
-  
-      switch (name) {
-      case MAX_CONNECTIONS:
-*** misc/mozilla/widget/src/gtk2/nsDragService.cpp	Thu Oct 30 02:48:41 2003
---- misc/build/mozilla/widget/src/gtk2/nsDragService.cpp	Sat Nov  5 22:54:28 2005
+*** misc/mozilla/widget/src/gtk2/nsDragService.cpp	Wed Oct 29 20:48:41 2003
+--- misc/build/mozilla/widget/src/gtk2/nsDragService.cpp	Tue Jan 10 17:55:24 2006
 ***************
 *** 838,844 ****
               (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));

  endif # NS_USE_GCC
  ifdef USE_PURE_32
  # this builds for Sparc v8 pure 32-bit architecture
*** misc/mozilla/security/nss/lib/nss/config.mk	2004-10-16 01:52:33.000000000 +0200
--- misc/build/mozilla/security/nss/lib/nss/config.mk	2005-07-13 17:26:54.000000000 +0200
***************
*** 107,120 ****
  # The -R '$ORIGIN' linker option instructs this library to search for its

      return err;
  }
  
*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Wed Jan 28 12:22:13 2004
--- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Tue Jan 10 17:55:24 2006
***************
*** 396,401 ****
--- 396,402 ----
