Split osd.h and util.h

client.c

@@ -13,6 +13,7 @@
 #include <X11/Xatom.h>
 
 #undef DEBUG
+#include "util.h"
 #include "osd.h"
 
 static Display *dpy;

osd-alsa.c

@@ -12,6 +12,7 @@
 #include <getopt.h>
 #include <alsa/asoundlib.h>
 
+#include "util.h"
 #include "osd.h"
 
 static char *alsa_device = "default";

osd-batt.c

@@ -14,6 +14,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 
+#include "util.h"
 #include "osd.h"
 
 static int check_mode;

osd.h

 /*
- *	On-screen Display Daemon -- Utility Functions
+ *	On-screen Display Daemon -- Client Interface
  *
  *	(c) 2010 Martin Mares <mj@ucw.cz>
  */
 
-#include <inttypes.h>
-
-#define NONRET __attribute__((noreturn))
-#define FORMAT_CHECK(func,i,j) __attribute__((format(func,i,j)))
-
-typedef uint64_t timestamp_t;
-
-/* util.c */
-
-void NONRET FORMAT_CHECK(printf,1,2) die(char *fmt, ...);
-
-#ifdef DEBUG
-#define DBG(f...) printf(f)
-#else
-#define DBG(f...) do { } while(0)
-#endif
-
-void *xmalloc(int size);
-void *xrealloc(void *ptr, int size);
-
-timestamp_t get_current_time(void);
-
 /* client.c */
 
 void osd_init(void);

osdc.c

@@ -11,6 +11,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include "util.h"
 #include "osd.h"
 
 static struct osd_msg *msg;

osdd.c

@@ -16,7 +16,8 @@
 #include <X11/Xatom.h>
 
 #undef DEBUG
-#include "osd.h"
+#include "util.h"
+#include "display.h"
 
 static xosd *osd;
 

util.h

+/*
+ *	On-screen Display Daemon -- Utility Functions
+ *
+ *	(c) 2010--2013 Martin Mares <mj@ucw.cz>
+ */
+
+#include <inttypes.h>
+
+#define NONRET __attribute__((noreturn))
+#define FORMAT_CHECK(func,i,j) __attribute__((format(func,i,j)))
+
+typedef uint64_t timestamp_t;
+
+/* util.c */
+
+void NONRET FORMAT_CHECK(printf,1,2) die(char *fmt, ...);
+
+#ifdef DEBUG
+#define DBG(f...) printf(f)
+#else
+#define DBG(f...) do { } while(0)
+#endif
+
+void *xmalloc(int size);
+void *xrealloc(void *ptr, int size);
+
+timestamp_t get_current_time(void);