From d39bda76c4007c42452a81883fefc671b816a74b Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 28 Mar 2018 12:21:50 -0400
Subject: Address review comments

---
 include/buffer_pool.h | 21 ---------------------
 include/cairo.h       |  3 ++-
 include/meson.build   |  1 +
 include/pool-buffer.h | 21 +++++++++++++++++++++
 4 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 include/buffer_pool.h
 create mode 100644 include/meson.build
 create mode 100644 include/pool-buffer.h

(limited to 'include')

diff --git a/include/buffer_pool.h b/include/buffer_pool.h
deleted file mode 100644
index cdebd64d..00000000
--- a/include/buffer_pool.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _SWAY_BUFFERS_H
-#define _SWAY_BUFFERS_H
-#include <cairo/cairo.h>
-#include <pango/pangocairo.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <wayland-client.h>
-
-struct pool_buffer {
-	struct wl_buffer *buffer;
-	cairo_surface_t *surface;
-	cairo_t *cairo;
-	PangoContext *pango;
-	uint32_t width, height;
-	bool busy;
-};
-
-struct pool_buffer *get_next_buffer(struct wl_shm *shm,
-		struct pool_buffer pool[static 2], uint32_t width, uint32_t height);
-
-#endif
diff --git a/include/cairo.h b/include/cairo.h
index f5f474d7..31672705 100644
--- a/include/cairo.h
+++ b/include/cairo.h
@@ -8,7 +8,8 @@ void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
 cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image,
 		int width, int height);
 
-#ifdef WITH_GDK_PIXBUF
+#include "config.h"
+#ifdef HAVE_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 00000000..65ed027a
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1 @@
+configure_file(output: 'config.h',  configuration: conf_data)
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
new file mode 100644
index 00000000..cdebd64d
--- /dev/null
+++ b/include/pool-buffer.h
@@ -0,0 +1,21 @@
+#ifndef _SWAY_BUFFERS_H
+#define _SWAY_BUFFERS_H
+#include <cairo/cairo.h>
+#include <pango/pangocairo.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <wayland-client.h>
+
+struct pool_buffer {
+	struct wl_buffer *buffer;
+	cairo_surface_t *surface;
+	cairo_t *cairo;
+	PangoContext *pango;
+	uint32_t width, height;
+	bool busy;
+};
+
+struct pool_buffer *get_next_buffer(struct wl_shm *shm,
+		struct pool_buffer pool[static 2], uint32_t width, uint32_t height);
+
+#endif
-- 
cgit v1.2.3