From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 7 Feb 2012 00:07:19 +0000 (+0100)
Subject: Some C++ fixes for slightly stricter GCC.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=51e6903f55674443aad56235dcfb74f334c401e8

Some C++ fixes for slightly stricter GCC.
---

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index cedd03a..df2360b 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index a9251a3..b2a6315 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 #include <map>
+#include <assert.h>
 
 #include "resolution.h"
 #include "groupscreen.h"
diff --git a/bigscreen/widestring.cpp b/bigscreen/widestring.cpp
index 4b67ec7..a0d781a 100644
--- a/bigscreen/widestring.cpp
+++ b/bigscreen/widestring.cpp
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <cstring>
 #include <iconv.h>
 #include <endian.h>
 #include <exception>
@@ -65,9 +67,13 @@ void widestring::operator= (const char *from)
 	delete[] to_buf;
 }
 
+namespace pqxx
+{
+
 template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
+void from_string<widestring>(const char *from, widestring &to)
 {
 	to = from;
 }
 
+}