From 2fb2d3cc2a785221796373e15fb7ddabe9e07b4c Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org>
Date: Wed, 16 May 2001 12:46:47 +0000
Subject: [PATCH] bug #75220: rs=brendan, r=axel@pike.org.  fixing string
 names.  add the renamed implementations to the build.

---
 string/macbuild/string.mcp       | Bin 75711 -> 75711 bytes
 string/src/Makefile.in           |   3 +++
 string/src/makefile.win          |  31 +++++++++++++++++--------------
 xpcom/string/macbuild/string.mcp | Bin 75711 -> 75711 bytes
 xpcom/string/src/Makefile.in     |   3 +++
 xpcom/string/src/makefile.win    |  31 +++++++++++++++++--------------
 6 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/string/macbuild/string.mcp b/string/macbuild/string.mcp
index d837bc6116b13e86f712a0b5dfd1efebd78f0f75..17aef8f1abc48bb9da3f59de273362ef8196b105 100644
GIT binary patch
delta 1170
zcmZvbPe>F|9LL{V$I&%oT~>32T(w0j5QY9o?qzm%rcg3W)*xtgH5+vmR>_r$h)q3o
zidtT<hKPulqKi4iMi&<ftO(YqLj`pRp@Ww$m8i9S=Z}+;1E2T%{(f)f``+(8W--Gp
zX1MuZc6KM<osjn{jf4<C#Q<c4L2#20{tF@bkjO_ANg9gwbjOrvcPug#rM;!7>)+WR
zfc9Mj@aJFvR?Z;@vU;~b$|+Hh^@Cmz0exUVUEbS8S(D?98ygUSwiyuwfCOab2|Z`4
z_CjOFWh@??WG|ebm~?A~{RvhTVnG3Di;L`YQ$4%yy3MlFk65#-%8lI#zz;+a01}WB
zV!3*-<h(B)9g&q`C3;DT#&&dB*E2j!woL|Omm|@>|Ei-GM|Pdq>D9lBlTmY;YX>bO
zHul(~7WwRyHMBYS2epKBa_Z@}Vq4;D9;>&%v>(N>9RtS`;vqHMeuEG2El9Of#lvr%
ztfu1_v=hg}Ph!yK@bD^z0bLS)32|_a`X~zr)9&qu2^|0uur6Wy>Q5GCukD%JjJR1v
zd)keA7Jwg!AOIvFtMA8a%5nv)(#zuayt#g;K3$1W{kjT3MRX-W4d_aS8cZz~(MHOC
zkIm9@HZ$Jp44i6iIjLEjQD)!9rw$jH*%33=m{BmJ-;5$-6CW!{hU)}fWSQ##o#ZVS
z0v+TXcL9VFqPQ^o>Ks3Mm5}QND)ntp_Ij;U&$*{Y{&n5R`Bo!e-!$?w50S4?)sfxE
zGn*E&TTN@qXj)T7)0#4x)|A!s37T@)>4fQ#6ztSAF{JKdNZrPex{o0(qj?y){uzb$
zSw^}vjC5%lx$uH%q)E$YfhL{h^aou@=6UEdemaX^Kb>0gP_K>FCRZzI9ba67J6lOr
lRM7)ATQHoIyeNh|D1Jy?@oF#rOiop!HnyqPGS&1u{R@xbAmIQ2

delta 620
zcmdmgo@M`emJQ!IS&bMN7>p)5>Zck584ip<0*LK^R4NcRFfg$BFfeccnLvJCx{+RT
zK>>(^1i<>3fC4}a(q{m~4$MFTh~az|ARmbBHc#MkX5RdoH<oc?fW%}E{xg%~gU`d<
zU^01~(2B`N1aD1N6FD>au802QnZmu3f6nEeoE5x-RUc@C{zOO1&FZ2NR+E*h#5X(0
zE?}H&7Rb*QCdI%Y%fHz>P=sl+T+D&V`Df>E-WMXrHd&*<3aE;oand{%WHT&4Dkkp>
zQRD!+$rj|UiH>tOEv)2T{3lal^8dMu7^NmJn&-dyT@#Nat1Zyp$jS9nlvzQ(iP;`6
z&A18ZdNrUUS4-*vJ*^MK20&~G#701D48$ftf9;;=;sddG!$g;+O$$$kvV}foV9=Vs
z`Qi27jFV6O5C`*ZxFP&UzkvKF3=Ew2A^cx|AbcZbApZyBX8!-b*`bcH|BvpN?fjgK
z%~0v-_MD7p^7FRy3nR%3!{n#)i!mx}zBNaU5g1H7jMD{W8NV`~na(c9xQngv4=_p_
zwjY;cRAyonnf_XVQIAb%9xw>bY?oJLRAOQhQJe0p3=|BG2MQk8UakyMC^vn!Do`v$
M9xQfVmGJ{309jkAWB>pF

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 d837bc6116b13e86f712a0b5dfd1efebd78f0f75..17aef8f1abc48bb9da3f59de273362ef8196b105 100644
GIT binary patch
delta 1170
zcmZvbPe>F|9LL{V$I&%oT~>32T(w0j5QY9o?qzm%rcg3W)*xtgH5+vmR>_r$h)q3o
zidtT<hKPulqKi4iMi&<ftO(YqLj`pRp@Ww$m8i9S=Z}+;1E2T%{(f)f``+(8W--Gp
zX1MuZc6KM<osjn{jf4<C#Q<c4L2#20{tF@bkjO_ANg9gwbjOrvcPug#rM;!7>)+WR
zfc9Mj@aJFvR?Z;@vU;~b$|+Hh^@Cmz0exUVUEbS8S(D?98ygUSwiyuwfCOab2|Z`4
z_CjOFWh@??WG|ebm~?A~{RvhTVnG3Di;L`YQ$4%yy3MlFk65#-%8lI#zz;+a01}WB
zV!3*-<h(B)9g&q`C3;DT#&&dB*E2j!woL|Omm|@>|Ei-GM|Pdq>D9lBlTmY;YX>bO
zHul(~7WwRyHMBYS2epKBa_Z@}Vq4;D9;>&%v>(N>9RtS`;vqHMeuEG2El9Of#lvr%
ztfu1_v=hg}Ph!yK@bD^z0bLS)32|_a`X~zr)9&qu2^|0uur6Wy>Q5GCukD%JjJR1v
zd)keA7Jwg!AOIvFtMA8a%5nv)(#zuayt#g;K3$1W{kjT3MRX-W4d_aS8cZz~(MHOC
zkIm9@HZ$Jp44i6iIjLEjQD)!9rw$jH*%33=m{BmJ-;5$-6CW!{hU)}fWSQ##o#ZVS
z0v+TXcL9VFqPQ^o>Ks3Mm5}QND)ntp_Ij;U&$*{Y{&n5R`Bo!e-!$?w50S4?)sfxE
zGn*E&TTN@qXj)T7)0#4x)|A!s37T@)>4fQ#6ztSAF{JKdNZrPex{o0(qj?y){uzb$
zSw^}vjC5%lx$uH%q)E$YfhL{h^aou@=6UEdemaX^Kb>0gP_K>FCRZzI9ba67J6lOr
lRM7)ATQHoIyeNh|D1Jy?@oF#rOiop!HnyqPGS&1u{R@xbAmIQ2

delta 620
zcmdmgo@M`emJQ!IS&bMN7>p)5>Zck584ip<0*LK^R4NcRFfg$BFfeccnLvJCx{+RT
zK>>(^1i<>3fC4}a(q{m~4$MFTh~az|ARmbBHc#MkX5RdoH<oc?fW%}E{xg%~gU`d<
zU^01~(2B`N1aD1N6FD>au802QnZmu3f6nEeoE5x-RUc@C{zOO1&FZ2NR+E*h#5X(0
zE?}H&7Rb*QCdI%Y%fHz>P=sl+T+D&V`Df>E-WMXrHd&*<3aE;oand{%WHT&4Dkkp>
zQRD!+$rj|UiH>tOEv)2T{3lal^8dMu7^NmJn&-dyT@#Nat1Zyp$jS9nlvzQ(iP;`6
z&A18ZdNrUUS4-*vJ*^MK20&~G#701D48$ftf9;;=;sddG!$g;+O$$$kvV}foV9=Vs
z`Qi27jFV6O5C`*ZxFP&UzkvKF3=Ew2A^cx|AbcZbApZyBX8!-b*`bcH|BvpN?fjgK
z%~0v-_MD7p^7FRy3nR%3!{n#)i!mx}zBNaU5g1H7jMD{W8NV`~na(c9xQngv4=_p_
zwjY;cRAyonnf_XVQIAb%9xw>bY?oJLRAOQhQJe0p3=|BG2MQk8UakyMC^vn!Do`v$
M9xQfVmGJ{309jkAWB>pF

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>