Commit b86afef3 authored by 's avatar

Fixes for GCC 4.4. Thanks John for this patch!


git-svn-id: https://google-glog.googlecode.com/svn/trunk@41 eb4d4688-79bd-11dd-afb4-1d65580434c0
parent 4a3f102c
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdio.h>
#include <stdlib.h>
#include "base/commandlineflags.h" #include "base/commandlineflags.h"
#include "glog/logging.h" #include "glog/logging.h"
#include "glog/raw_logging.h" #include "glog/raw_logging.h"
......
...@@ -441,8 +441,7 @@ class LineReader { ...@@ -441,8 +441,7 @@ class LineReader {
void operator=(const LineReader&); void operator=(const LineReader&);
char *FindLineFeed() { char *FindLineFeed() {
return reinterpret_cast<char *> return reinterpret_cast<char *>(memchr(bol_, '\n', eod_ - bol_));
(memchr(reinterpret_cast<const void *>(bol_), '\n', eod_ - bol_));
} }
bool BufferIsEmpty() { bool BufferIsEmpty() {
...@@ -456,7 +455,7 @@ class LineReader { ...@@ -456,7 +455,7 @@ class LineReader {
const int fd_; const int fd_;
char * const buf_; char * const buf_;
const int buf_len_; const int buf_len_;
const char *bol_; char *bol_;
char *eol_; char *eol_;
const char *eod_; // End of data in "buf_". const char *eod_; // End of data in "buf_".
}; };
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
#include "utilities.h" #include "utilities.h"
#include <stdio.h>
#include <stdlib.h>
#include <signal.h> #include <signal.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment