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 77885781dcf8e31061d720fb92debb7b8c8c12a5..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,7 +48,6 @@
 #include "table.h"
 #include "vector.h"
 #include "url.h"
-#include "log.h"
 #include "inputline.h"
 #include "split.h"
 #include "mime.h"
@@ -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;