Description: Fix FTBFS with gcc-4.7
Author: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com>
Forwarded: not-needed, svn trunk seems to have these or similar

=== modified file 'src/base/CmdQueue.h'
--- old/src/base/CmdQueue.h	2011-12-06 22:44:56 +0000
+++ new/src/base/CmdQueue.h	2012-06-04 03:48:02 +0000
@@ -41,7 +41,7 @@
 template<class RECEIVER>
 void CmdQueue<RECEIVER>::pushCmd(typename Command<RECEIVER>::CmdFunc func)
 {
-    push(CmdPtr(new Command<RECEIVER>(func)));
+    this->push(CmdPtr(new Command<RECEIVER>(func)));
 }
 
 }

=== modified file 'src/base/FileHelper.cpp'
--- old/src/base/FileHelper.cpp	2011-12-06 22:44:56 +0000
+++ new/src/base/FileHelper.cpp	2012-06-04 03:48:02 +0000
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <map>
 #include <cstring>

=== modified file 'src/base/Rect.h'
--- old/src/base/Rect.h	2011-12-06 22:44:56 +0000
+++ new/src/base/Rect.h	2012-06-04 03:48:02 +0000
@@ -171,19 +171,19 @@
 template<class NUM>
 void Rect<NUM>::expand(const Rect<NUM>& rect)
 {
-    tl.x = min(tl.x, rect.tl.x);
-    tl.y = min(tl.y, rect.tl.y);
-    br.x = max(br.x, rect.br.x);
-    br.y = max(br.y, rect.br.y);
+    tl.x = std::min(tl.x, rect.tl.x);
+    tl.y = std::min(tl.y, rect.tl.y);
+    br.x = std::max(br.x, rect.br.x);
+    br.y = std::max(br.y, rect.br.y);
 }
 
 template<class NUM>
 void Rect<NUM>::intersect(const Rect<NUM>& rect)
 {
-    tl.x = max(tl.x, rect.tl.x);
-    tl.y = max(tl.y, rect.tl.y);
-    br.x = min(br.x, rect.br.x);
-    br.y = min(br.y, rect.br.y);
+    tl.x = std::max(tl.x, rect.tl.x);
+    tl.y = std::max(tl.y, rect.tl.y);
+    br.x = std::min(br.x, rect.br.x);
+    br.y = std::min(br.y, rect.br.y);
 }
 
 template<class NUM>

=== modified file 'src/base/TimeSource.cpp'
--- old/src/base/TimeSource.cpp	2011-12-06 22:44:56 +0000
+++ new/src/base/TimeSource.cpp	2012-06-04 03:48:02 +0000
@@ -34,6 +34,7 @@
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <errno.h>
 #include <assert.h>

=== modified file 'src/parport/ParPort.cpp'
--- old/src/parport/ParPort.cpp	2011-12-06 22:44:56 +0000
+++ new/src/parport/ParPort.cpp	2012-06-04 03:48:02 +0000
@@ -35,6 +35,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #include <cstring>
 #include <iostream>