Move struct datbase def to settings.h from session.h

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 79e7ad2..447c396 100644 (file)
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -45,7 +45,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "settings.h"
 #include "eventl.h"
 #include "http.h"
-#include "session.h"
 
 struct conf_config
 {

diff --git a/src/session.h b/src/session.h
index 732efbc..de5427f 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -26,9 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/yaz-ccl.h>
 
 #include "facet_limit.h"
-#include "termlists.h"
 #include "reclists.h"
-#include "http.h"
 
 struct record;
 struct client;
@@ -54,15 +52,6 @@ enum pazpar2_error_code {
     PAZPAR2_LAST_ERROR
 };
 
-// Represents a database
-struct database {
-    char *id;
-    int num_settings;
-    struct setting **settings;
-    struct database *next;
-};
-
-
 // Represents a database as viewed from one session, possibly with settings overriden
 // for that session
 struct session_database

diff --git a/src/settings.h b/src/settings.h
index b0da583..d36a5a2 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -66,6 +66,14 @@ struct setting
     struct setting *next;
 };
 
+// Represents a database
+struct database {
+    char *id;
+    int num_settings;
+    struct setting **settings;
+    struct database *next;
+};
+
 struct settings_array
 {
     // Array of pointer setting, index is looked up in setting_dictionary