Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / cgi / disorder-cgi.h

diff --git a/cgi/disorder-cgi.h b/cgi/disorder-cgi.h
index 9a455e9ed6f3ce978471f65a87e0082b1be8295a..78156322f0059204dc7b25ada45cb6df6050dc18 100644 (file)
--- a/cgi/disorder-cgi.h
+++ b/cgi/disorder-cgi.h
@@ -28,8 +28,10 @@
 #include <time.h>
 #include <errno.h>
 #include <ctype.h>
+#include <locale.h>
 #include <stddef.h>
 
+#include "log.h"
 #include "mem.h"
 #include "kvp.h"
 #include "queue.h"
@@ -46,12 +48,12 @@
 #include "table.h"
 #include "vector.h"
 #include "url.h"
-#include "log.h"
 #include "inputline.h"
 #include "split.h"
 #include "mime.h"
 #include "sendmail.h"
 #include "charset.h"
+#include "syscalls.h"
 
 extern disorder_client *dcgi_client;
 extern char *dcgi_cookie;
@@ -76,7 +78,6 @@ struct queue_entry *dcgi_findtrack(const char *id);
 void option_set(const char *name, const char *value);
 const char *option_label(const char *key);
 int option_label_exists(const char *key);
-char **option_columns(const char *name, int *ncolumns);
 
 #define DCGI_QUEUE 0x0001
 #define DCGI_PLAYING 0x0002
@@ -91,8 +92,8 @@ extern struct queue_entry *dcgi_queue;
 extern struct queue_entry *dcgi_playing;
 extern struct queue_entry *dcgi_recent;
 
-extern int dcgi_volume_left;
-extern int dcgi_volume_right;
+extern long dcgi_volume_left;
+extern long dcgi_volume_right;
 
 extern char **dcgi_new;
 extern int dcgi_nnew;