1 files changed, 9 insertions, 7 deletions
diff --git a/lib/Buffer.cc b/lib/Buffer.cc
index 905090e..db8b3ee 100644
--- a/lib/Buffer.cc
+++ b/lib/Buffer.cc
@@ -1,7 +1,9 @@
 #include <string.h>
-#include "Buffer.h"
-#include "General.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+#include "Buffer.h"
+#include "generic.h"
 
 Buffer::Buffer() : Handle(-1), buffer(0), zero(0), realsiz(0), bufsiz(0), ptr(0) { }
 
@@ -50,15 +52,15 @@ ssize_t Buffer::read(void *buf, size_t count) throw (GeneralException) {
     return count;
 }
 
-bool Buffer::CanRead() {
+bool Buffer::CanRead() const {
     return true;
 }
 
-bool Buffer::CanWrite() {
+bool Buffer::CanWrite() const {
     return true;
 }
 
-String Buffer::GetName() {
+String Buffer::GetName() const {
     return "Buffer";
 }
 
@@ -77,11 +79,11 @@ Buffer Buffer::operator=(const Buffer & b) {
     return *this;
 }
 
-bool Buffer::CanWatch() {
+bool Buffer::CanWatch() const {
     return false;
 }
 
-ssize_t Buffer::GetSize() {
+ssize_t Buffer::GetSize() const {
     return realsiz;
 }