[passepartout/passepartout-0-7: 6/9] gcc-4.4 fixes



commit 233e4443e302a5287c1847f68b055239f8092f44
Author: Sven Herzberg <herzi lanedo com>
Date:   Wed Apr 15 12:59:55 2009 +0200

    gcc-4.4 fixes
    
    * src/util/filedescriptors.cc,
    * src/util/stringutil.h,
    * src/util/warning.cc: include <cstdio> to have EOF defined
---
 src/util/filedescriptors.cc |    5 ++++-
 src/util/stringutil.h       |    5 +++--
 src/util/warning.cc         |    2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/util/filedescriptors.cc b/src/util/filedescriptors.cc
index 44e2fe5..1eb7bd0 100644
--- a/src/util/filedescriptors.cc
+++ b/src/util/filedescriptors.cc
@@ -2,10 +2,13 @@
 // Copyright (C) 2003, 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
 ///
 #include "filedescriptors.h"
-#include "filesys.h"
+
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "filesys.h"
+
 int
 filedesc::move(int to, int from) {
   if (to == from) return 0;
diff --git a/src/util/stringutil.h b/src/util/stringutil.h
index 1e4188f..884c607 100644
--- a/src/util/stringutil.h
+++ b/src/util/stringutil.h
@@ -4,10 +4,11 @@
 // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
 ///
 #include "typeinfo.h"
-#include <string>
+#include <cstdio>
+#include <iostream>
 #include <sstream>
 #include <stdexcept>
-#include <iostream>
+#include <string>
 // The to / from string converters here is declared inline, since that is a
 // lot easier than actually makeing partial template compilation work as it
 // should.
diff --git a/src/util/warning.cc b/src/util/warning.cc
index e8c95ff..172ae26 100644
--- a/src/util/warning.cc
+++ b/src/util/warning.cc
@@ -3,6 +3,8 @@
 ///
 #include "warning.h"
 
+#include <cstdio>
+
 class NullFdBuf : public std::streambuf {
 public:
   NullFdBuf() { setp(0, 0); }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]