diff --git a/profile/dirserviceprovider/src/nsProfileStringTypes.h b/profile/dirserviceprovider/src/nsProfileStringTypes.h index 796c7deeff3..f951b81fa63 100644 --- a/profile/dirserviceprovider/src/nsProfileStringTypes.h +++ b/profile/dirserviceprovider/src/nsProfileStringTypes.h @@ -50,20 +50,15 @@ */ #ifdef STANDALONE_PROFILEDIRSERVICE + #define MOZILLA_STRICT_API -#include "nsEmbedString.h" +#include "nsStringAPI.h" -typedef nsEmbedString nsString; -typedef nsEmbedCString nsPromiseFlatCString; -typedef nsEmbedCString nsCAutoString; +typedef nsCString nsPromiseFlatCString; +typedef nsCString nsCAutoString; + +#define PromiseFlatCString nsCString -#define NS_LITERAL_CSTRING nsEmbedCString -#define EmptyString nsEmbedString -#define PromiseFlatCString nsEmbedCString -#define NS_NAMED_LITERAL_STRING(stringname, filename) \ - nsEmbedString stringname; \ - NS_CStringToUTF16(nsEmbedCString(filename), \ - NS_CSTRING_ENCODING_ASCII, stringname); #else #include "nsString.h" #include "nsPromiseFlatString.h"