diff --git a/string/macbuild/string.mcp b/string/macbuild/string.mcp index d837bc6116b..17aef8f1abc 100644 Binary files a/string/macbuild/string.mcp and b/string/macbuild/string.mcp differ diff --git a/string/src/Makefile.in b/string/src/Makefile.in index 8b9d5ee1b9c..a2bae18b645 100644 --- a/string/src/Makefile.in +++ b/string/src/Makefile.in @@ -36,6 +36,9 @@ REQUIRES = xpcom CPPSRCS = \ nsAFlatString.cpp \ nsAString.cpp \ + nsDependentConcatenation.cpp \ + nsDependentString.cpp \ + nsDependentSubstring.cpp \ nsFragmentedString.cpp \ nsLocalString.cpp \ nsPrintfCString.cpp \ diff --git a/string/src/makefile.win b/string/src/makefile.win index cd1ed65060f..46873d2c581 100644 --- a/string/src/makefile.win +++ b/string/src/makefile.win @@ -28,20 +28,23 @@ LIBRARY_NAME=string_s LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN -CPP_OBJS = \ - .\$(OBJDIR)\nsAFlatString.obj \ - .\$(OBJDIR)\nsAString.obj \ - .\$(OBJDIR)\nsFragmentedString.obj \ - .\$(OBJDIR)\nsLocalString.obj \ - .\$(OBJDIR)\nsPrintfCString.obj \ - .\$(OBJDIR)\nsPrivateSharableString.obj \ - .\$(OBJDIR)\nsPromiseConcatenation.obj \ - .\$(OBJDIR)\nsPromiseFlatString.obj \ - .\$(OBJDIR)\nsPromiseSubstring.obj \ - .\$(OBJDIR)\nsReadableUtils.obj \ - .\$(OBJDIR)\nsSharableString.obj \ - .\$(OBJDIR)\nsSharedBufferList.obj \ - .\$(OBJDIR)\nsSlidingString.obj \ +CPP_OBJS = \ + .\$(OBJDIR)\nsAFlatString.obj \ + .\$(OBJDIR)\nsAString.obj \ + .\$(OBJDIR)\nsDependentConcatenation.obj \ + .\$(OBJDIR)\nsDependentString.obj \ + .\$(OBJDIR)\nsDependentSubstring.obj \ + .\$(OBJDIR)\nsFragmentedString.obj \ + .\$(OBJDIR)\nsLocalString.obj \ + .\$(OBJDIR)\nsPrintfCString.obj \ + .\$(OBJDIR)\nsPrivateSharableString.obj \ + .\$(OBJDIR)\nsPromiseConcatenation.obj \ + .\$(OBJDIR)\nsPromiseFlatString.obj \ + .\$(OBJDIR)\nsPromiseSubstring.obj \ + .\$(OBJDIR)\nsReadableUtils.obj \ + .\$(OBJDIR)\nsSharableString.obj \ + .\$(OBJDIR)\nsSharedBufferList.obj \ + .\$(OBJDIR)\nsSlidingString.obj \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/xpcom/string/macbuild/string.mcp b/xpcom/string/macbuild/string.mcp index d837bc6116b..17aef8f1abc 100644 Binary files a/xpcom/string/macbuild/string.mcp and b/xpcom/string/macbuild/string.mcp differ diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index 8b9d5ee1b9c..a2bae18b645 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -36,6 +36,9 @@ REQUIRES = xpcom CPPSRCS = \ nsAFlatString.cpp \ nsAString.cpp \ + nsDependentConcatenation.cpp \ + nsDependentString.cpp \ + nsDependentSubstring.cpp \ nsFragmentedString.cpp \ nsLocalString.cpp \ nsPrintfCString.cpp \ diff --git a/xpcom/string/src/makefile.win b/xpcom/string/src/makefile.win index cd1ed65060f..46873d2c581 100644 --- a/xpcom/string/src/makefile.win +++ b/xpcom/string/src/makefile.win @@ -28,20 +28,23 @@ LIBRARY_NAME=string_s LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN -CPP_OBJS = \ - .\$(OBJDIR)\nsAFlatString.obj \ - .\$(OBJDIR)\nsAString.obj \ - .\$(OBJDIR)\nsFragmentedString.obj \ - .\$(OBJDIR)\nsLocalString.obj \ - .\$(OBJDIR)\nsPrintfCString.obj \ - .\$(OBJDIR)\nsPrivateSharableString.obj \ - .\$(OBJDIR)\nsPromiseConcatenation.obj \ - .\$(OBJDIR)\nsPromiseFlatString.obj \ - .\$(OBJDIR)\nsPromiseSubstring.obj \ - .\$(OBJDIR)\nsReadableUtils.obj \ - .\$(OBJDIR)\nsSharableString.obj \ - .\$(OBJDIR)\nsSharedBufferList.obj \ - .\$(OBJDIR)\nsSlidingString.obj \ +CPP_OBJS = \ + .\$(OBJDIR)\nsAFlatString.obj \ + .\$(OBJDIR)\nsAString.obj \ + .\$(OBJDIR)\nsDependentConcatenation.obj \ + .\$(OBJDIR)\nsDependentString.obj \ + .\$(OBJDIR)\nsDependentSubstring.obj \ + .\$(OBJDIR)\nsFragmentedString.obj \ + .\$(OBJDIR)\nsLocalString.obj \ + .\$(OBJDIR)\nsPrintfCString.obj \ + .\$(OBJDIR)\nsPrivateSharableString.obj \ + .\$(OBJDIR)\nsPromiseConcatenation.obj \ + .\$(OBJDIR)\nsPromiseFlatString.obj \ + .\$(OBJDIR)\nsPromiseSubstring.obj \ + .\$(OBJDIR)\nsReadableUtils.obj \ + .\$(OBJDIR)\nsSharableString.obj \ + .\$(OBJDIR)\nsSharedBufferList.obj \ + .\$(OBJDIR)\nsSlidingString.obj \ $(NULL) include <$(DEPTH)\config\rules.mak>