1 files changed, 8 insertions, 4 deletions

diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h
index 25439cf2..cbe5538b 100644
--- a/src/core/basetypes/MCString.h
+++ b/src/core/basetypes/MCString.h
@@ -6,6 +6,7 @@
 #include <MailCore/MCRange.h>
 #include <MailCore/MCICUTypes.h>
 
+#include <stdlib.h>
 #include <stdarg.h>
 
 #ifdef __cplusplus
@@ -15,7 +16,7 @@ namespace mailcore {
     class Data;
     class Array;
     
-    class String : public Object {
+    class MAILCORE_EXPORT String : public Object {
     public:
         String(const UChar * unicodeChars = NULL);
         String(const UChar * unicodeChars, unsigned int length);
@@ -51,7 +52,8 @@ namespace mailcore {
         virtual String * stringByAppendingCharacters(const UChar * unicodeCharacters);
         virtual String * stringByAppendingPathComponent(String * component);
         virtual String * stringByDeletingLastPathComponent();
-        
+        virtual String * stringByDeletingPathExtension();
+
         virtual int compare(String * otherString);
         virtual int caseInsensitiveCompare(String * otherString);
         virtual String * lowercaseString();
@@ -61,7 +63,8 @@ namespace mailcore {
         virtual void deleteCharactersInRange(Range range);
         virtual unsigned int replaceOccurrencesOfString(String * occurrence, String * replacement);
         virtual int locationOfString(String * occurrence);
-        
+        virtual int lastLocationOfString(String * occurrence);
+
         virtual Array * componentsSeparatedByString(String * separator);
         
         virtual bool isEqualCaseInsensitive(String * otherString);
@@ -130,13 +133,14 @@ namespace mailcore {
         UChar * mUnicodeChars;
         unsigned int mLength;
         unsigned int mAllocated;
-        void allocate(unsigned int length);
+        void allocate(unsigned int length, bool force = false);
         void reset();
         int compareWithCaseSensitive(String * otherString, bool caseSensitive);
         void appendBytes(const char * bytes, unsigned int length, const char * charset);
         void appendUTF8CharactersLength(const char * UTF8Characters, unsigned int length);
     };
     
+    MAILCORE_EXPORT
     void setICUDataDirectory(String * directory);
 }