Skip to content

Commit

Permalink
Fix building with compilers that dont support __has_include
Browse files Browse the repository at this point in the history
  • Loading branch information
kovidgoyal committed Jul 29, 2019
1 parent e350822 commit cab949a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
5 changes: 5 additions & 0 deletions glfw/backend_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,15 @@
#include <unistd.h>
#include <stdbool.h>

#ifdef __has_include
#if __has_include(<sys/eventfd.h>)
#define HAS_EVENT_FD
#include <sys/eventfd.h>
#endif
#else
#define HAS_EVENT_FD
#include <sys/eventfd.h>
#endif

typedef unsigned long long id_type;
typedef void(*watch_callback_func)(int, int, void*);
Expand Down
4 changes: 4 additions & 0 deletions glfw/wl_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@
#include <fcntl.h>
#include <wayland-client.h>
// Needed for the BTN_* defines
#ifdef __has_include
#if __has_include(<linux/input.h>)
#include <linux/input.h>
#elif __has_include(<dev/evdev/input.h>)
#include <dev/evdev/input.h>
#endif
#else
#include <linux/input.h>
#endif


static inline int min(int n1, int n2)
Expand Down
7 changes: 7 additions & 0 deletions kitty/loop-utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <fcntl.h>
#include <unistd.h>

#ifdef __has_include
#if __has_include(<sys/signalfd.h>)
#define HAS_SIGNAL_FD
#include <sys/signalfd.h>
Expand All @@ -19,6 +20,12 @@
#define HAS_EVENT_FD
#include <sys/eventfd.h>
#endif
#else
#define HAS_SIGNAL_FD
#include <sys/signalfd.h>
#define HAS_EVENT_FD
#include <sys/eventfd.h>
#endif

typedef struct {
#ifndef HAS_EVENT_FD
Expand Down

0 comments on commit cab949a

Please sign in to comment.