From 8923057d0ebd0f6cf2b8d6c5115a2288593bed67 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Fri, 3 May 2013 13:00:48 -0700
Subject: [PATCH] Compile fix, need to use integer GL uniform.

---
 interface/src/main.cpp      | 4 ++--
 pairing-server/src/main.cpp | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 7bf7a181ff..78cc08485b 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -847,13 +847,13 @@ void displayOculus(Camera& whichCamera) {
     glDisable(GL_BLEND);
     glEnable(GL_TEXTURE_2D);
     glUseProgramObjectARB(::oculusProgramID);
-    glUniform1fARB(textureLocation, 0);
+    glUniform1iARB(textureLocation, 0);
     glUniform2fARB(lensCenterLocation, 0.287994, 0.5); // see SDK docs, p. 29
     glUniform2fARB(screenCenterLocation, 0.25, 0.5);
     glUniform2fARB(scaleLocation, 0.25 * scaleFactor, 0.5 * scaleFactor * aspectRatio);
     glUniform2fARB(scaleInLocation, 4, 2 / aspectRatio);
     glUniform4fARB(hmdWarpParamLocation, 1.0, 0.22, 0.24, 0);
-    
+
     glColor3f(1, 0, 1);
     glBegin(GL_QUADS);
     glTexCoord2f(0, 0);
diff --git a/pairing-server/src/main.cpp b/pairing-server/src/main.cpp
index a17f425443..4273d561c6 100644
--- a/pairing-server/src/main.cpp
+++ b/pairing-server/src/main.cpp
@@ -9,6 +9,9 @@
 #include <iostream>
 #include <vector>
 
+#include <stdio.h>
+#include <string.h>
+
 #include <UDPSocket.h>
 #include <arpa/inet.h>
 
@@ -101,4 +104,4 @@ int main(int argc, const char* argv[]) {
         }
     }
         
-}
\ No newline at end of file
+}