Merge playlist branch against trunk to date.

[disorder] / lib / trackdb-int.h

diff --git a/lib/trackdb-int.h b/lib/trackdb-int.h
index 6d5234e064228c9de706e9a4675858d5c5339405..b21b5d9f83349a8f95d3ee3d1c90cee391dbe704 100644 (file)
--- a/lib/trackdb-int.h
+++ b/lib/trackdb-int.h
@@ -22,6 +22,7 @@
 
 #include <db.h>
 
 
 #include <db.h>
 

+#include "trackdb.h"

 #include "kvp.h"
 
 struct vector;                          /* forward declaration */
 #include "kvp.h"
 
 struct vector;                          /* forward declaration */


@@ -36,6 +37,7 @@ extern DB *trackdb_noticeddb;
 extern DB *trackdb_globaldb;
 extern DB *trackdb_usersdb;
 extern DB *trackdb_scheduledb;
 extern DB *trackdb_globaldb;
 extern DB *trackdb_usersdb;
 extern DB *trackdb_scheduledb;

+extern DB *trackdb_playlistsdb;

 
 DBC *trackdb_opencursor(DB *db, DB_TXN *tid);
 /* open a transaction */
 
 DBC *trackdb_opencursor(DB *db, DB_TXN *tid);
 /* open a transaction */


@@ -151,6 +153,7 @@ int trackdb_get_global_tid(const char *name,
 
 char **parsetags(const char *s);
 int tag_intersection(char **a, char **b);
 
 char **parsetags(const char *s);
 int tag_intersection(char **a, char **b);

+int valid_username(const char *user);

 
 #endif /* TRACKDB_INT_H */
 
 
 #endif /* TRACKDB_INT_H */