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
This commit is contained in:
parent
4a3f102ce0
commit
b86afef3f7
@ -46,6 +46,9 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -48,6 +48,9 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "base/commandlineflags.h"
|
||||
#include "glog/logging.h"
|
||||
#include "glog/raw_logging.h"
|
||||
|
||||
@ -441,8 +441,7 @@ class LineReader {
|
||||
void operator=(const LineReader&);
|
||||
|
||||
char *FindLineFeed() {
|
||||
return reinterpret_cast<char *>
|
||||
(memchr(reinterpret_cast<const void *>(bol_), '\n', eod_ - bol_));
|
||||
return reinterpret_cast<char *>(memchr(bol_, '\n', eod_ - bol_));
|
||||
}
|
||||
|
||||
bool BufferIsEmpty() {
|
||||
@ -456,7 +455,7 @@ class LineReader {
|
||||
const int fd_;
|
||||
char * const buf_;
|
||||
const int buf_len_;
|
||||
const char *bol_;
|
||||
char *bol_;
|
||||
char *eol_;
|
||||
const char *eod_; // End of data in "buf_".
|
||||
};
|
||||
|
||||
@ -31,6 +31,9 @@
|
||||
|
||||
#include "utilities.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <signal.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user