From f438a4cf0b78c5c6b8b073af0ba3558213f48cf1 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 16 Feb 2009 22:45:53 -0500 Subject: a DONT_NEED_X preprocessor guard to keep things testable We're changing the way the wayland server advertises it's address, but we haven't updated the clients yet. This preprocessor define is a stop gap to keep things testable. --- wayland-system-compositor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wayland-system-compositor.c b/wayland-system-compositor.c index d15127f..03cd25d 100644 --- a/wayland-system-compositor.c +++ b/wayland-system-compositor.c @@ -1128,7 +1128,11 @@ int main(int argc, char *argv[]) GOptionContext *context; struct wl_event_loop *loop; struct wlsc_dbus *dbus; +#ifdef DONT_NEED_X char socket_name[96]; +#else + char socket_name[] = "\0wayland"; +#endif context = g_option_context_new(NULL); g_option_context_add_main_entries(context, option_entries, "Wayland"); @@ -1157,7 +1161,9 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } +#ifdef DONT_NEED_X generate_socket_name (socket_name, sizeof socket_name); +#endif /* FIXME: should probably generate a new name and loop in the extremely * off chance of EADDRINUSE -- cgit v1.2.3