From 390a66d2e74927a0bbaf708bcf7a7bc49a731369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@glfw.org>
Date: Tue, 28 Nov 2017 14:20:54 +0100
Subject: [PATCH 1/2] Fix missing header in gamma test

---
 tests/gamma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/gamma.c b/tests/gamma.c
index c692cf9ac..fbd37622e 100644
--- a/tests/gamma.c
+++ b/tests/gamma.c
@@ -46,6 +46,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 static void error_callback(int error, const char* description)
 {

From 30489c5aa1392f698e904c6aced1d7a486634c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@glfw.org>
Date: Tue, 28 Nov 2017 14:37:49 +0100
Subject: [PATCH 2/2] X11: Expose zero monitor for functional headless

Fixes #1147.
---
 src/x11_monitor.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/x11_monitor.c b/src/x11_monitor.c
index d68c58886..d9144bb48 100644
--- a/src/x11_monitor.c
+++ b/src/x11_monitor.c
@@ -203,8 +203,7 @@ void _glfwPollMonitorsX11(void)
 
         free(disconnected);
     }
-
-    if (!_glfw.monitorCount)
+    else
     {
         const int widthMM = DisplayWidthMM(_glfw.x11.display, _glfw.x11.screen);
         const int heightMM = DisplayHeightMM(_glfw.x11.display, _glfw.x11.screen);