compositor: Fold the log prototypes into compositor.h and drop log.h

We're trying to keep the API exposed by the core compositor in compositor.h

diff --git a/src/compositor-android.c b/src/compositor-android.c
index 98956f6..a61c5ea 100644 (file)
--- a/src/compositor-android.c
+++ b/src/compositor-android.c
@@ -30,7 +30,6 @@
 
 #include "compositor.h"
 #include "android-framebuffer.h"
-#include "log.h"
 
 struct android_compositor;
 

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 2075a99..44458c0 100644 (file)
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -41,7 +41,6 @@
 #include "compositor.h"
 #include "evdev.h"
 #include "launcher-util.h"
-#include "log.h"
 
 static int option_current_mode = 0;
 static char *output_name;

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 8e86611..ed28b1d 100644 (file)
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -42,7 +42,6 @@
 #include <EGL/eglext.h>
 
 #include "compositor.h"
-#include "log.h"
 
 struct wayland_compositor {
        struct weston_compositor         base;

diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index e27555d..4507463 100644 (file)
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -49,7 +49,6 @@
 
 #include "compositor.h"
 #include "../shared/config-parser.h"
-#include "log.h"
 
 struct x11_compositor {
        struct weston_compositor         base;

diff --git a/src/compositor.c b/src/compositor.c
index aee68bf..4f5388d 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -53,7 +53,6 @@
 #include <wayland-server.h>
 #include "compositor.h"
 #include "../shared/os-compatibility.h"
-#include "log.h"
 #include "git-version.h"
 
 static struct wl_list child_process_list;

diff --git a/src/compositor.h b/src/compositor.h
index 899fa42..25aabcd 100644 (file)
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -685,6 +685,18 @@ weston_seat_init_touch(struct weston_seat *seat);
 void
 weston_seat_release(struct weston_seat *seat);
 
+/* String literal of spaces, the same width as the timestamp. */
+#define STAMP_SPACE "               "
+
+void
+weston_log_file_open(const char *filename);
+void
+weston_log_file_close(void);
+int
+weston_log(const char *fmt, ...);
+int
+weston_log_continue(const char *fmt, ...);
+
 enum {
        TTY_ENTER_VT,
        TTY_LEAVE_VT

diff --git a/src/evdev.c b/src/evdev.c
index c294a3a..6141bca 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -31,7 +31,6 @@
 #include "evdev.h"
 #include "evdev-private.h"
 #include "launcher-util.h"
-#include "log.h"
 
 static void
 evdev_led_update(struct weston_seat *seat_base, enum weston_led leds)

diff --git a/src/log.c b/src/log.c
index 0452e65..e5430d6 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -30,7 +30,7 @@
 #include <wayland-server.h>
 #include <wayland-util.h>
 
-#include "log.h"
+#include "compositor.h"
 
 static FILE *weston_logfile = NULL;
 

diff --git a/src/log.h b/src/log.h
deleted file mode 100644 (file)
index 178b5cd..0000000
--- a/src/log.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright © 2012 Martin Minarik
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the copyright holders not be used in
- * advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  The copyright holders make
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _WESTON_LOG_H_
-#define _WESTON_LOG_H_
-
-/* String literal of spaces, the same width as the timestamp. */
-#define STAMP_SPACE "               "
-
-void weston_log_file_open(const char *filename);
-void weston_log_file_close(void);
-
-int weston_log(const char *fmt, ...);
-int weston_log_continue(const char *fmt, ...);
-
-#endif

diff --git a/src/shell.c b/src/shell.c
index 6821836..2e0a33e 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -36,7 +36,6 @@
 #include "compositor.h"
 #include "desktop-shell-server-protocol.h"
 #include "../shared/config-parser.h"
-#include "log.h"
 
 #define DEFAULT_NUM_WORKSPACES 1
 #define DEFAULT_WORKSPACE_CHANGE_ANIMATION_LENGTH 200

diff --git a/src/tablet-shell.c b/src/tablet-shell.c
index 528a42e..f17d888 100644 (file)
--- a/src/tablet-shell.c
+++ b/src/tablet-shell.c
@@ -29,7 +29,6 @@
 
 #include "compositor.h"
 #include "tablet-shell-server-protocol.h"
-#include "log.h"
 
 /*
  * TODO: Don't fade back from black until we've received a lockscreen

diff --git a/src/tty.c b/src/tty.c
index d8df2b5..72f8fac 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 
 #include "compositor.h"
-#include "log.h"
 
 /* Introduced in 2.6.38 */
 #ifndef K_OFF

diff --git a/src/xwayland/launcher.c b/src/xwayland/launcher.c
index 035c8e3..aab74f0 100644 (file)
--- a/src/xwayland/launcher.c
+++ b/src/xwayland/launcher.c
@@ -34,7 +34,6 @@
 
 #include "xwayland.h"
 #include "xserver-server-protocol.h"
-#include "../log.h"
 
 
 static int

diff --git a/src/xwayland/selection.c b/src/xwayland/selection.c
index 21fbb59..0ec571a 100644 (file)
--- a/src/xwayland/selection.c
+++ b/src/xwayland/selection.c
@@ -28,7 +28,6 @@
 #include <fcntl.h>
 
 #include "xwayland.h"
-#include "../log.h"
 
 static int
 weston_wm_write_property(int fd, uint32_t mask, void *data)

diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index e67cac1..d724d47 100644 (file)
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -37,7 +37,6 @@
 
 #include "../../shared/cairo-util.h"
 #include "../compositor.h"
-#include "../log.h"
 #include "xserver-server-protocol.h"
 #include "hash.h"