fixing win32 build issues r=shaver

storage/build/Makefile.in

@@ -68,11 +68,12 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \
 	$(NULL)
-
+ 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
+	$(MOZ_JS_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

storage/src/mozStorageConnection.cpp

@@ -269,7 +269,7 @@ mozStorageConnection::CreateTable(/*const nsID& aID,*/
     char *buf;
     int buflen = 0;
 
-    buflen = snprintf(nsnull, 0, "CREATE TABLE %s (%s)", aTableName, aTableSchema);
+    buflen = PR_snprintf(nsnull, 0, "CREATE TABLE %s (%s)", aTableName, aTableSchema);
     if (buflen <= 0)
         return NS_ERROR_FAILURE;
 
@@ -277,7 +277,7 @@ mozStorageConnection::CreateTable(/*const nsID& aID,*/
     if (!buf)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    buflen = snprintf(buf, buflen+1, "CREATE TABLE %s (%s)", aTableName, aTableSchema);
+    buflen = PR_snprintf(buf, buflen+1, "CREATE TABLE %s (%s)", aTableName, aTableSchema);
     if (buflen <= 0) {
         nsMemory::Free(buf);
         return NS_ERROR_FAILURE;

storage/test/storage1.cpp

@@ -31,7 +31,7 @@ static NS_DEFINE_CID(kmozStorageConnectionCID, MOZ_STORAGE_CONNECTION_CID);
 #ifdef XP_UNIX
 #define TEST_DB NS_LITERAL_CSTRING("/tmp/foo.sdb")
 #else
-#define TEST_DB NS_LITERAL_STRING("foo.sdb")
+#define TEST_DB NS_LITERAL_CSTRING("foo.sdb")
 #endif
 
 int gerr;