From c2a2114590ed289a14e64fcce614b852237f7b0f Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Thu, 22 Mar 2012 23:30:00 +0100
Subject: [PATCH] Fixed GCC warnings.

---
 src/x11_fullscreen.c | 2 +-
 src/x11_init.c       | 4 ++--
 src/x11_time.c       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/x11_fullscreen.c b/src/x11_fullscreen.c
index f7855c4b..37a3ae98 100644
--- a/src/x11_fullscreen.c
+++ b/src/x11_fullscreen.c
@@ -323,7 +323,7 @@ struct _glfwResolution
 int _glfwPlatformGetVideoModes(GLFWvidmode* list, int maxcount)
 {
     int count, k, l, r, g, b, rgba, gl;
-    int depth, screen;
+    int depth, screen = DefaultScreen(_glfwLibrary.X11.display);
     XVisualInfo* vislist;
     XVisualInfo dummy;
     int viscount, rgbcount, rescount;
diff --git a/src/x11_init.c b/src/x11_init.c
index 3ed9ab13..d57af27e 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -470,8 +470,8 @@ static void initGammaRamp(void)
     // RandR gamma support is only available with version 1.2 and above
     if (_glfwLibrary.X11.RandR.available &&
         (_glfwLibrary.X11.RandR.majorVersion > 1 ||
-         _glfwLibrary.X11.RandR.majorVersion == 1 &&
-         _glfwLibrary.X11.RandR.minorVersion >= 2))
+         (_glfwLibrary.X11.RandR.majorVersion == 1 &&
+          _glfwLibrary.X11.RandR.minorVersion >= 2)))
     {
         // FIXME: Assumes that all monitors have the same size gamma tables
         // This is reasonable as I suspect the that if they did differ, it
diff --git a/src/x11_time.c b/src/x11_time.c
index 4184d326..f1445233 100644
--- a/src/x11_time.c
+++ b/src/x11_time.c
@@ -30,6 +30,7 @@
 
 #include "internal.h"
 
+#include <sys/time.h>
 #include <time.h>