fixes for gcc 4.4

This commit is contained in:
John A. Khvatov 2009-02-26 23:40:29 +00:00
parent 4f36d1ec21
commit bc72e23626
4 changed files with 65 additions and 14 deletions

60
glog-gcc4.4.patch Normal file
View File

@ -0,0 +1,60 @@
index 8e41d5e..d4bb7de 100644
--- src/googletest.h
+++ src/googletest.h
@@ -14,6 +14,9 @@
#include <string>
#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
index 14c9789..47ba36f 100644
--- src/logging_unittest.cc
+++ src/logging_unittest.cc
@@ -23,6 +23,9 @@
#include <string>
#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+
#include "base/commandlineflags.h"
#include "glog/logging.h"
#include "glog/raw_logging.h"
index e6e3e70..0e1b6cb 100644
--- src/symbolize.cc
+++ src/symbolize.cc
@@ -414,7 +414,7 @@ class LineReader {
char *FindLineFeed() {
return reinterpret_cast<char *>
- (memchr(reinterpret_cast<const void *>(bol_), '\n', eod_ - bol_));
+ (memchr(reinterpret_cast<void *>(bol_), '\n', eod_ - bol_));
}
bool BufferIsEmpty() {
@@ -428,7 +428,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_".
};
index e8cbc0c..f06bcdd 100644
--- src/utilities.cc
+++ src/utilities.cc
@@ -3,6 +3,9 @@
#include "utilities.h"
+#include <stdio.h>
+#include <stdlib.h>
+
#include <signal.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>

View File

@ -1,10 +0,0 @@
--- src/utilities.cc 2009-01-23 04:37:14.000000000 +0300
+++ src/utilities.cc 2009-02-27 00:18:51.000000000 +0300
@@ -3,6 +3,7 @@
#include "utilities.h"
+#include <stdio.h>
#include <signal.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>

View File

@ -1,6 +1,6 @@
Name: glog Name: glog
Version: 0.2 Version: 0.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: A C++ application logging library Summary: A C++ application logging library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -8,7 +8,7 @@ License: BSD
URL: http://code.google.com/p/google-glog URL: http://code.google.com/p/google-glog
Source0: http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz Source0: http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz
Patch0: glog-r38.patch Patch0: glog-r38.patch
Patch1: glog-missing-header.patch Patch1: glog-gcc4.4.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf BuildRequires: autoconf
@ -70,8 +70,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Feb 27 2009 John A. Khvatov <ivaxer@fedoraproject.org> 0.2-4 * Fri Feb 27 2009 John A. Khvatov <ivaxer@fedoraproject.org> 0.2-5
- Added missing header for gcc 4.4 - fixes for gcc 4.4
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-3 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

View File

@ -1,3 +1,4 @@
glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10.src.rpm:1229343821 glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10.src.rpm:1229343821
glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474 glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474
glog-0_2-4_fc10:HEAD:glog-0.2-4.fc10.src.rpm:1235684646 glog-0_2-4_fc10:HEAD:glog-0.2-4.fc10.src.rpm:1235684646
glog-0_2-5_fc10:HEAD:glog-0.2-5.fc10.src.rpm:1235691384