circular include logic defeated me ... protect the new operator definitions locally

string/obsolete/nsString.h

@@ -865,7 +865,10 @@ public:
 #if 0//def NEW_STRING_APIS
 NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char)
 #endif
+
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+#endif
 
 /***************************************************************
   The subsumestr class is very unusual. 

string/obsolete/nsString2.h

@@ -952,7 +952,9 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+#endif
 
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString

xpcom/ds/nsString.h

@@ -865,7 +865,10 @@ public:
 #if 0//def NEW_STRING_APIS
 NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char)
 #endif
+
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+#endif
 
 /***************************************************************
   The subsumestr class is very unusual. 

xpcom/ds/nsString2.h

@@ -952,7 +952,9 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+#endif
 
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString

xpcom/string/obsolete/nsString.h

@@ -865,7 +865,10 @@ public:
 #if 0//def NEW_STRING_APIS
 NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char)
 #endif
+
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+#endif
 
 /***************************************************************
   The subsumestr class is very unusual. 

xpcom/string/obsolete/nsString2.h

@@ -952,7 +952,9 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+#ifdef NEW_STRING_APIS
 NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+#endif
 
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString