Some C++ fixes for slightly stricter GCC.

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index cedd03affddd01fa4c859d3642177ea88bd9d646..df2360be5fc37436e1f005cf6aab9c4994093295 100644 (file)
--- 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 a9251a316a0ed663ee9ec5d900c953ee25fa069b..b2a63159540810fcd1f3d6be6202fc3b44d735e2 100644 (file)
--- 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 4b67ec7c2b168e158ccc90e1b90a7ad228d03256..a0d781a4edf5d22ded01667e4e84bc259c522670 100644 (file)
--- 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;
 }
 
+}