[ecmascript] localstorage-db.c moved

src/ecmascript/Makefile

@@ -4,7 +4,7 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS)	+= spidermonkey
 
-OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= css2xpath.o ecmascript.o spidermonkey.o
+OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= css2xpath.o ecmascript.o localstorage-db.o spidermonkey.o
 
 ifeq ($(CONFIG_ECMASCRIPT_SMJS), yes)
 CONFIG_ANY_SPIDERMONKEY = yes

src/ecmascript/localstorage-db.c

@@ -1,4 +1,4 @@
-/* The SpiderMonkey localstorage database helper implementation. */
+/* The localstorage database helper implementation. */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

src/ecmascript/localstorage-db.h

@@ -1,5 +1,5 @@
-#ifndef EL__ECMASCRIPT_SPIDERMONKEY_LOCALSTORAGE_DB_H
+#ifndef EL__ECMASCRIPT_LOCALSTORAGE_DB_H
-#define EL__ECMASCRIPT_SPIDERMONKEY_LOCALSTORAGE_DB_H
+#define EL__ECMASCRIPT_LOCALSTORAGE_DB_H
 
 #include <sqlite3.h>
 #include <stdio.h>

src/ecmascript/meson.build

@@ -1,7 +1,7 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')
 	subdir('spidermonkey')
-	srcs += files('css2xpath.c', 'ecmascript.c', 'spidermonkey.c')
+	srcs += files('css2xpath.c', 'ecmascript.c', 'localstorage-db.c', 'spidermonkey.c')
 endif
 
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')

src/ecmascript/spidermonkey/Makefile

@@ -3,6 +3,6 @@ include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
 OBJS = attr.o attributes.o collection.o console.o document.o element.o form.o heartbeat.o history.o implementation.o \
-	location.o localstorage.o localstorage-db.o navigator.o nodelist.o screen.o unibar.o window.o
+	location.o localstorage.o navigator.o nodelist.o screen.o unibar.o window.o
 
 include $(top_srcdir)/Makefile.lib

src/ecmascript/spidermonkey/localstorage.c

@@ -23,10 +23,10 @@
 #include "document/forms.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
+#include "ecmascript/localstorage-db.h"
 #include "ecmascript/spidermonkey/form.h"
 #include "ecmascript/spidermonkey/location.h"
 #include "ecmascript/spidermonkey/localstorage.h"
-#include "ecmascript/spidermonkey/localstorage-db.h"
 #include "ecmascript/spidermonkey/document.h"
 #include "ecmascript/spidermonkey/window.h"
 #include "intl/libintl.h"

src/ecmascript/spidermonkey/localstorage.h

@@ -3,7 +3,7 @@
 #define EL__ECMASCRIPT_SPIDERMONKEY_LOCALSTORAGE_H
 
 #include "ecmascript/spidermonkey/util.h"
-#include "ecmascript/spidermonkey/localstorage-db.h"
+#include "ecmascript/localstorage-db.h"
 
 extern const JSClass localstorage_class;
 extern const spidermonkeyFunctionSpec localstorage_funcs[];

src/ecmascript/spidermonkey/meson.build

@@ -1,3 +1,3 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')
+srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'history.c', 'implementation.c', 'location.c', 'localstorage.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')