gcc 4.3 compilation fix

This commit is contained in:
jjh 2008-03-01 20:28:08 +00:00
parent 2cb4cfe6cc
commit 8ac846824b
3 changed files with 26 additions and 2 deletions

View File

@ -0,0 +1,20 @@
diff -ru haproxy-1.3.14.2.orig/include/common/compat.h haproxy-1.3.14.2/include/common/compat.h
--- haproxy-1.3.14.2.orig/include/common/compat.h 2008-01-20 16:06:34.000000000 -0700
+++ haproxy-1.3.14.2/include/common/compat.h 2008-02-26 08:47:47.000000000 -0700
@@ -35,6 +35,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <common/config.h>
+#include <common/standard.h>
/* INTBITS
* how many bits are needed to code the size of an int on the target platform.
@@ -63,6 +64,8 @@
#endif
#if defined(TPROXY) && defined(NETFILTER)
+#include <linux/types.h>
+#include <linux/netfilter_ipv6.h>
#include <linux/netfilter_ipv4.h>
#endif

View File

@ -73,7 +73,7 @@ reload() {
return 1 return 1
fi fi
echo -n $"Reloading $prog: " echo -n $"Reloading $prog: "
$exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid) $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid)
retval=$? retval=$?
echo echo
return $retval return $retval

View File

@ -6,7 +6,7 @@
Name: haproxy Name: haproxy
Version: 1.3.14.2 Version: 1.3.14.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
Group: System Environment/Daemons Group: System Environment/Daemons
@ -118,6 +118,10 @@ fi
%changelog %changelog
* Sat Mar 01 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.14.2-3
- fix gcc 4.3 bug [#434144]
- update init script to properly reload configuration
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.3.14.2-2 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.3.14.2-2
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3