diff options
| author | emersion <contact@emersion.fr> | 2018-11-18 00:33:06 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-11-18 00:33:06 +0100 |
| commit | cad851805bea6b4777685df1c6adf8cb9fa71835 (patch) | |
| tree | 145fcb048cc3df3d04a8b6afb90de68dd2dd80a9 /common | |
| parent | eda3bfeed5097c71634332bfe998188b028abf02 (diff) | |
Use #if instead of #ifdef
Diffstat (limited to 'common')
| -rw-r--r-- | common/background-image.c | 8 | ||||
| -rw-r--r-- | common/cairo.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/background-image.c b/common/background-image.c index 5ede55e3..72f39a79 100644 --- a/common/background-image.c +++ b/common/background-image.c @@ -24,7 +24,7 @@ enum background_mode parse_background_mode(const char *mode) { cairo_surface_t *load_background_image(const char *path) { cairo_surface_t *image; -#ifdef HAVE_GDK_PIXBUF +#if HAVE_GDK_PIXBUF GError *err = NULL; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &err); if (!pixbuf) { @@ -36,17 +36,17 @@ cairo_surface_t *load_background_image(const char *path) { g_object_unref(pixbuf); #else image = cairo_image_surface_create_from_png(path); -#endif //HAVE_GDK_PIXBUF +#endif // HAVE_GDK_PIXBUF if (!image) { wlr_log(WLR_ERROR, "Failed to read background image."); return NULL; } if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) { wlr_log(WLR_ERROR, "Failed to read background image: %s." -#ifndef HAVE_GDK_PIXBUF +#if !HAVE_GDK_PIXBUF "\nSway was compiled without gdk_pixbuf support, so only" "\nPNG images can be loaded. This is the likely cause." -#endif //HAVE_GDK_PIXBUF +#endif // !HAVE_GDK_PIXBUF , cairo_status_to_string(cairo_surface_status(image))); return NULL; } diff --git a/common/cairo.c b/common/cairo.c index e8231484..f2ad54c1 100644 --- a/common/cairo.c +++ b/common/cairo.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <cairo/cairo.h> #include "cairo.h" -#ifdef HAVE_GDK_PIXBUF +#if HAVE_GDK_PIXBUF #include <gdk-pixbuf/gdk-pixbuf.h> #endif @@ -46,7 +46,7 @@ cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image, return new; } -#ifdef HAVE_GDK_PIXBUF +#if HAVE_GDK_PIXBUF cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(const GdkPixbuf *gdkbuf) { int chan = gdk_pixbuf_get_n_channels(gdkbuf); if (chan < 3) { @@ -140,4 +140,4 @@ cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(const GdkPixbuf *gdk cairo_surface_mark_dirty(cs); return cs; } -#endif //HAVE_GDK_PIXBUF +#endif // HAVE_GDK_PIXBUF |