bug #59429: xpcom gets string code from mozilla/string instead of locally

xpcom/build/Makefile.in

@@ -48,6 +48,8 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libxpt.$(LIB_SUFFIX) \
 		$(DIST)/lib/libxptcmd.$(LIB_SUFFIX) \
 		$(DIST)/lib/libmozreg_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libstring_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libstring_obsolete_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 LOCAL_INCLUDES	= \

xpcom/build/makefile.win

@@ -72,7 +72,9 @@ LLIBS =                                \
         $(DIST)\lib\xpcomxptcmd_s.lib  \
         $(DIST)\lib\xpcomxptinfo_s.lib \
         $(DIST)\lib\xpcomproxy_s.lib   \
-        $(DIST)\lib\mozreg.lib       \
+        $(DIST)\lib\string_s.lib       \
+        $(DIST)\lib\string_obsolete_s.lib   \
+        $(DIST)\lib\mozreg.lib         \
         $(NULL)
 
 WIN_LIBS =                             \

xpcom/ds/MANIFEST

@@ -1,8 +1,5 @@
-nsAlgorithm.h
 nsAVLTree.h
 nsAtomService.h
-nsBufferHandle.h
-nsBufferHandleUtils.h
 nsCppSharedAllocator.h
 nsCRT.h
 nsDeque.h
@@ -17,21 +14,9 @@ nsISimpleEnumerator.h
 nsISizeOfHandler.h
 nsIUnicharBuffer.h
 nsInt64.h
-nsPrivateSharableString.h
 nsQuickSort.h
-nsCharTraits.h
-nsAReadableString.h
-nsAWritableString.h
-nsPrintfCString.h
-nsReadableUtils.h
-nsSharedBufferList.h
-nsSharedString.h
-nsSlidingString.h
 nsStaticNameTable.h
 nsStatistics.h
-nsStr.h
-nsString.h
-nsString2.h
 nsSupportsArray.h
 nsSupportsPrimitives.h
 nsTime.h
@@ -39,7 +24,6 @@ nsUnitConversion.h
 nsVector.h
 nsVoidArray.h
 nsVoidBTree.h
-nsXPIDLString.h
 pldhash.h
 plvector.h
 nsTextFormatter.h

xpcom/ds/Makefile.in

@@ -32,7 +32,7 @@ LIBRARY_NAME	= xpcomds_s
 REQUIRES	= unicharutil
 
 CSRCS = \
-                pldhash.c \
+		pldhash.c \
 		plvector.c \
 		$(NULL)
 
@@ -48,41 +48,29 @@ CPPSRCS		= \
 		nsEmptyEnumerator.cpp \
 		nsEnumeratorUtils.cpp \
 		nsFixedSizeAllocator.cpp \
-		nsFragmentedString.cpp \
 		nsHashtable.cpp \
 		nsHashtableEnumerator.cpp \
 		nsObserver.cpp \
 		nsObserverList.cpp \
 		nsObserverService.cpp \
-		nsPrintfCString.cpp \
 		nsProperties.cpp \
 		nsPersistentProperties.cpp \
 		nsQuickSort.cpp \
-		nsReadableUtils.cpp \
-		nsSharedBufferList.cpp \
 		nsSizeOfHandler.cpp \
-		nsSlidingString.cpp \
 		nsStaticNameTable.cpp \
 		nsStatistics.cpp \
-		nsStr.cpp \
-		nsString.cpp \
-		nsString2.cpp \
 		nsSupportsArray.cpp \
 		nsSupportsArrayEnumerator.cpp \
 		nsSupportsPrimitives.cpp \
 		nsUnicharBuffer.cpp \
 		nsVoidArray.cpp \
 		nsVoidBTree.cpp \
-		nsXPIDLString.cpp \
 		nsTextFormatter.cpp \
 		$(NULL)
 
 EXPORTS		= \
-		nsAlgorithm.h \
 		nsAVLTree.h \
 		nsAtomService.h \
-		nsBufferHandle.h \
-		nsBufferHandleUtils.h \
 		nsCppSharedAllocator.h \
 		nsCRT.h \
 		nsDeque.h \
@@ -97,21 +85,9 @@ EXPORTS		= \
 		nsISizeOfHandler.h \
 		nsIUnicharBuffer.h \
 		nsInt64.h \
-		nsPrivateSharableString.h \
 		nsQuickSort.h \
-		nsCharTraits.h \
-		nsAReadableString.h \
-		nsAWritableString.h \
-		nsPrintfCString.h \
-		nsReadableUtils.h \
-		nsSharedBufferList.h \
-		nsSharedString.h \
-		nsSlidingString.h \
 		nsStaticNameTable.h \
 		nsStatistics.h \
-		nsStr.h \
-		nsString.h \
-		nsString2.h \
 		nsSupportsArray.h \
 		nsSupportsPrimitives.h \
 		nsTime.h \
@@ -119,8 +95,7 @@ EXPORTS		= \
 		nsVector.h \
 		nsVoidArray.h \
 		nsVoidBTree.h \
-		nsXPIDLString.h \
-                pldhash.h \
+		pldhash.h \
 		plvector.h \
 		nsTextFormatter.h \
 		$(NULL)			

xpcom/ds/makefile.win

@@ -28,11 +28,8 @@ MODULE = xpcom
 ## exports
 
 EXPORTS =                          \
-        nsAlgorithm.h              \
         nsTextFormatter.h          \
         nsAVLTree.h                \
-        nsBufferHandle.h           \
-        nsBufferHandleUtils.h      \
         nsCppSharedAllocator.h     \
         nsCRT.h                    \
         nsDeque.h                  \
@@ -47,21 +44,9 @@ EXPORTS =                          \
         nsISizeOfHandler.h         \
         nsIUnicharBuffer.h         \
         nsInt64.h                  \
-        nsPrivateSharableString.h  \
         nsQuickSort.h              \
-        nsCharTraits.h             \
-        nsAReadableString.h        \
-        nsAWritableString.h        \
-        nsPrintfCString.h          \
-        nsReadableUtils.h          \
-        nsSharedBufferList.h       \
-        nsSharedString.h           \
-        nsSlidingString.h          \
         nsStaticNameTable.h        \
         nsStatistics.h             \
-        nsStr.h                    \
-        nsString.h                 \
-        nsString2.h                \
 	nsSupportsArray.h          \
         nsSupportsPrimitives.h     \
         nsTime.h                   \
@@ -69,7 +54,6 @@ EXPORTS =                          \
         nsVector.h                 \
         nsVoidArray.h              \
         nsVoidBTree.h              \
-        nsXPIDLString.h            \
         pldhash.h                  \
         plvector.h                 \
         $(NULL)			
@@ -115,7 +99,6 @@ CPP_OBJS =                                        \
         .\$(OBJDIR)\nsEmptyEnumerator.obj         \
         .\$(OBJDIR)\nsEnumeratorUtils.obj         \
         .\$(OBJDIR)\nsFixedSizeAllocator.obj      \
-        .\$(OBJDIR)\nsFragmentedString.obj        \
         .\$(OBJDIR)\nsHashtable.obj               \
         .\$(OBJDIR)\nsHashtableEnumerator.obj     \
         .\$(OBJDIR)\nsObserver.obj                \
@@ -123,17 +106,12 @@ CPP_OBJS =                                        \
         .\$(OBJDIR)\nsObserverService.obj         \
         .\$(OBJDIR)\nsProperties.obj              \
         .\$(OBJDIR)\nsPersistentProperties.obj    \
-        .\$(OBJDIR)\nsPrintfCString.obj           \
         .\$(OBJDIR)\nsQuickSort.obj               \
         .\$(OBJDIR)\nsReadableUtils.obj           \
         .\$(OBJDIR)\nsSharedBufferList.obj        \
         .\$(OBJDIR)\nsSizeOfHandler.obj           \
-        .\$(OBJDIR)\nsSlidingString.obj           \
         .\$(OBJDIR)\nsStaticNameTable.obj         \
         .\$(OBJDIR)\nsStatistics.obj              \
-        .\$(OBJDIR)\nsStr.obj                     \
-        .\$(OBJDIR)\nsString.obj                  \
-        .\$(OBJDIR)\nsString2.obj                 \
         .\$(OBJDIR)\nsSupportsArray.obj           \
         .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
         .\$(OBJDIR)\nsSupportsPrimitives.obj      \
@@ -141,7 +119,6 @@ CPP_OBJS =                                        \
         .\$(OBJDIR)\nsUnicharBuffer.obj           \
         .\$(OBJDIR)\nsVoidArray.obj               \
         .\$(OBJDIR)\nsVoidBTree.obj               \
-        .\$(OBJDIR)\nsXPIDLString.obj             \
         .\$(OBJDIR)\pldhash.obj                   \
         .\$(OBJDIR)\plvector.obj                  \
         $(NULL)