rpms/glog/devel glog-gcc4.4.patch, NONE, 1.1 glog.spec, 1.4, 1.5 import.log, 1.3, 1.4 glog-missing-header.patch, 1.1, NONE

[John A. Khvatov]

Author: ivaxer

Update of /cvs/pkgs/rpms/glog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29458/devel

Modified Files:
	glog.spec import.log 
Added Files:
	glog-gcc4.4.patch 
Removed Files:
	glog-missing-header.patch 
Log Message:
fixes for gcc 4.4


glog-gcc4.4.patch:

--- NEW FILE glog-gcc4.4.patch ---
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>


Index: glog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/glog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glog.spec	26 Feb 2009 21:48:20 -0000	1.4
+++ glog.spec	26 Feb 2009 23:40:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glog
 Version:        0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C++ application logging library
 
 Group:          System Environment/Libraries
@@ -8,7 +8,7 @@
 URL:            http://code.google.com/p/google-glog
 Source0:        http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         glog-r38.patch
-Patch1:         glog-missing-header.patch
+Patch1:         glog-gcc4.4.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  autoconf
@@ -70,8 +70,8 @@
 
 
 %changelog
-* Fri Feb 27 2009 John A. Khvatov <ivaxer at fedoraproject.org> 0.2-4
-- Added missing header for gcc 4.4
+* Fri Feb 27 2009 John A. Khvatov <ivaxer at fedoraproject.org> 0.2-5
+- fixes for gcc 4.4
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Feb 2009 21:48:20 -0000	1.3
+++ import.log	26 Feb 2009 23:40:29 -0000	1.4
@@ -1,3 +1,4 @@
 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-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


--- glog-missing-header.patch DELETED ---