Date: Tue, 11 Sep 2007 15:36:02 -0300 From: Alejandro Pulver <alepulver@FreeBSD.org> To: ports@FreeBSD.org Subject: C++ ambiguous declaration of stat() Message-ID: <20070911153602.3ecf6182@deimos.mars.bsd>
next in thread | raw e-mail | index | archive | help
--Sig_Q5MkJ4//_142IKin29kVZeg
Content-Type: multipart/mixed; boundary="MP_CGHWaHDGZtZAdU8dL/Oh1+_"
--MP_CGHWaHDGZtZAdU8dL/Oh1+_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Hello.
I currently maintain net-p2p/qbittorrent and was making a port of the
development version, which fails to compile due to some name conflict
of stat() (the system function in sys/stat.h, and a local statistics
function from net-p2p/rblibtorrent-devel).
As I'm not used to C++, I don't know how to solve this (renaming, or
maybe some namespace directive?). Any help would be really appreciated.
The error is the following, and the patches for the ports
(rblibtorrent-devel and qbittorrent) are attached. Just in case, there
is also a patch for devel/commoncpp (which is including sys/stat.h).
In file included from /usr/local/include/cc++/file.h:70,
from /usr/local/include/cc++/common.h:55,
from downloadThread.h:33,
from bittorrent.cpp:39:
/usr/include/sys/stat.h:317: error: use of `stat' is ambiguous
/usr/include/sys/stat.h:131: error: first declared as `struct stat' here
/usr/local/include/libtorrent/stat.hpp:48: error: also declared as `class=
libtorrent::stat' here
/usr/include/sys/stat.h:317: error: conflicting declaration 'struct stat'
/usr/include/sys/stat.h:131: error: 'struct stat' has a previous declaratio=
n as `struct stat'
Thanks and Best Regards,
Ale
--MP_CGHWaHDGZtZAdU8dL/Oh1+_
Content-Type: text/x-patch; name=commoncpp.diff
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=commoncpp.diff
Index: commoncpp/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/devel/commoncpp/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- commoncpp/Makefile 17 Dec 2006 20:41:06 -0000 1.32
+++ commoncpp/Makefile 11 Sep 2007 17:44:02 -0000
@@ -6,35 +6,35 @@
#
=20
PORTNAME=3D commoncpp
-PORTVERSION=3D 1.5.2
+PORTVERSION=3D 1.5.7
PORTEPOCH=3D 2
CATEGORIES=3D devel
-MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=3D gnutelephony
+MASTER_SITES=3D GNU
DISTNAME=3D ${PORTNAME:S/$/2/}-${PORTVERSION}
=20
MAINTAINER=3D acm@FreeBSD.org
COMMENT=3D GNU project portable class framework for C++
=20
+USE_LDCONFIG=3D yes
USE_GNOME=3D gnomehack gnometarget
-
-.if !defined(WITHOUT_LIBXML2)
-USE_GNOME+=3D libxml2
-.else
-CONFIGURE_ARGS=3D --without-libxml2
-.endif
-
-USE_GETOPT_LONG=3Dyes
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
-USE_GCC=3D 3.4+
CONFIGURE_ENV=3D CPPFLAGS=3D"${CPPFLAGS}" LDFLAGS=3D"${LDFLAGS}" \
ac_cv_path_DOXYGEN=3Dno
-USE_LDCONFIG=3D yes
+
+OPTIONS=3D LIBXML2 "Enable libxml2 support" on
=20
INFO=3D commoncpp2
=20
CPPFLAGS=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS}
=20
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_LIBXML2)
+USE_GNOME+=3D libxml2
+.else
+CONFIGURE_ARGS+=3D--without-libxml2
+.endif
+
+.include <bsd.port.post.mk>
Index: commoncpp/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/devel/commoncpp/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- commoncpp/distinfo 17 Dec 2006 20:41:06 -0000 1.18
+++ commoncpp/distinfo 11 Sep 2007 17:44:02 -0000
@@ -1,3 +1,3 @@
-MD5 (commoncpp2-1.5.2.tar.gz) =3D 9d84aa85af660b0dbb8fb601cf783409
-SHA256 (commoncpp2-1.5.2.tar.gz) =3D 75e2a4777f7fc6764c176b79851ca9530f6c5=
c745e9f610dbedf4253fde5f200
-SIZE (commoncpp2-1.5.2.tar.gz) =3D 862550
+MD5 (commoncpp2-1.5.7.tar.gz) =3D bd85e157e1f4f457e9137c59d40a13fb
+SHA256 (commoncpp2-1.5.7.tar.gz) =3D 95b0e86c27db1ec0b79abe4097f4449f1e15d=
de1870202ead0551c506269a504
+SIZE (commoncpp2-1.5.7.tar.gz) =3D 858598
Index: commoncpp/files/patch-include-cc++_address.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/devel/commoncpp/files/patch-include-cc++_address=
.h,v
retrieving revision 1.1
diff -u -r1.1 patch-include-cc++_address.h
--- commoncpp/files/patch-include-cc++_address.h 5 Oct 2006 06:31:32 -0000 =
1.1
+++ commoncpp/files/patch-include-cc++_address.h 11 Sep 2007 17:44:02 -0000
@@ -1,28 +1,28 @@
---- include/cc++/address.h Sun Oct 1 07:07:12 2006
-+++ include/cc++/address.h Wed Oct 4 21:25:44 2006
-@@ -237,10 +237,10 @@
+--- ./include/cc++/address.h.orig Tue Jan 23 14:15:02 2007
++++ ./include/cc++/address.h Tue Sep 11 11:58:17 2007
+@@ -236,10 +236,10 @@
+ bool isMember(const struct in_addr &inaddr) const;
+=20
+ inline bool operator=3D=3D(const struct sockaddr *a) const
+- {return isMember(a);};
++ {return isMember(a);}
+=20
+ inline bool operator=3D=3D(const struct in_addr &a) const
+- {return isMember(a);};
++ {return isMember(a);}
};
=20
- inline bool operator=3D=3D(struct sockaddr *sa, IPV4Cidr &cidr)
-- {return cidr.isMember(sa);};
-+ {return cidr.isMember(sa);}
-=20
- inline bool operator=3D=3D(struct in_addr &a, IPV4Cidr &cidr)
-- {return cidr.isMember(a);};
-+ {return cidr.isMember(a);}
-=20
#ifdef CCXX_IPV6
- /**
-@@ -325,10 +325,10 @@
- };
+@@ -324,10 +324,10 @@
+ bool isMember(const struct in6_addr &inaddr) const;
=20
- inline bool operator=3D=3D(struct sockaddr *sa, IPV6Cidr &cidr)
-- {return cidr.isMember(sa);};
-+ {return cidr.isMember(sa);}
-=20
- inline bool operator=3D=3D(struct in6_addr &a, IPV6Cidr &cidr)
-- {return cidr.isMember(a);};
-+ {return cidr.isMember(a);}
+ inline bool operator=3D=3D(const struct sockaddr *sa) const
+- {return isMember(sa);};
++ {return isMember(sa);}
+=20
+ inline bool operator=3D=3D(const struct in6_addr &a) const
+- {return isMember(a);};
++ {return isMember(a);}
+ };
=20
#endif
-=20
Index: commoncpp/files/patch-src_timer.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: commoncpp/files/patch-src_timer.cpp
diff -N commoncpp/files/patch-src_timer.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ commoncpp/files/patch-src_timer.cpp 11 Sep 2007 17:44:02 -0000
@@ -0,0 +1,11 @@
+--- src/timer.cpp.orig Tue Jan 23 21:09:13 2007
++++ src/timer.cpp Tue Sep 11 13:12:41 2007
+@@ -117,7 +117,7 @@
+ active =3D true;
+ }
+=20
+-#ifdef HAVE_HIRES_TIMER
++#if defined(HAVE_HIRES_TIMER) && !defined(__FreeBSD__)
+ void TimerPort::sleepTimer(void)
+ {
+ struct timespec ts;
--MP_CGHWaHDGZtZAdU8dL/Oh1+_
Content-Type: text/x-patch; name=qbittorrent.diff
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=qbittorrent.diff
Index: qbittorrent/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/qbittorrent/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- qbittorrent/Makefile 29 Aug 2007 01:00:16 -0000 1.4
+++ qbittorrent/Makefile 11 Sep 2007 18:30:57 -0000
@@ -6,16 +6,16 @@
#
=20
PORTNAME=3D qbittorrent
-PORTVERSION=3D 0.9.3
-PORTREVISION=3D 1
+DISTVERSION=3D 1.0.0beta6
CATEGORIES=3D net-p2p
+PKGNAMESUFFIX=3D -devel
MASTER_SITES=3D SF
=20
MAINTAINER=3D alepulver@FreeBSD.org
COMMENT=3D Bittorrent client written in C++ / Qt4 using libtorrent
=20
-LIB_DEPENDS=3D curl.4:${PORTSDIR}/ftp/curl \
- torrent.1:${PORTSDIR}/net-p2p/rblibtorrent
+LIB_DEPENDS=3D ccext2-1.5.0:${PORTSDIR}/devel/commoncpp \
+ torrent.1:${PORTSDIR}/net-p2p/rblibtorrent-devel
=20
USE_PYTHON=3D 2.3+
USE_QT_VER=3D 4
@@ -24,18 +24,25 @@
HAS_CONFIGURE=3D yes
CONFIGURE_TARGET=3D #
CONFIGURE_ARGS=3D --with-libtorrent-inc=3D"${LOCALBASE}/include" \
- --with-libtorrent-lib=3D"${LOCALBASE}/lib" \
- --with-libcurl-inc=3D"${LOCALBASE}/include" \
- --with-libcurl-lib=3D"${LOCALBASE}/lib"
+ --with-libtorrent-lib=3D"${LOCALBASE}/lib"
CONFIGURE_ENV=3D QMAKESPEC=3D"${QMAKESPEC}"
MAKE_ENV=3D QMAKESPEC=3D"${QMAKESPEC}"
=20
+OPTIONS=3D IMAGEMAGICK "Enable libmagick++ support" off
+
MAN1=3D qbittorrent.1
MANCOMPRESSED=3D yes
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS+=3D Magick.10:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=3D--disable-libmagick
+.endif
=20
post-patch:
@${REINPLACE_CMD} -e 's|bin/qmake|bin/${QMAKE:T}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|$$$$PREFIX/share/man|${MANPREFIX}/man|' \
${WRKSRC}/src/src.pro
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: qbittorrent/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/qbittorrent/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- qbittorrent/distinfo 5 Jun 2007 05:53:05 -0000 1.2
+++ qbittorrent/distinfo 11 Sep 2007 18:30:57 -0000
@@ -1,3 +1,3 @@
-MD5 (qbittorrent-0.9.3.tar.gz) =3D b1f12106dd8b33c5280df5e02f0e9abf
-SHA256 (qbittorrent-0.9.3.tar.gz) =3D 532308bf882b9f55876599b4bcaefbc31bb4=
5ea9ff62ce6805c2688c06f03ca2
-SIZE (qbittorrent-0.9.3.tar.gz) =3D 836332
+MD5 (qbittorrent-1.0.0beta6.tar.gz) =3D 4c35e336a5242eeb455e6d4074c216ab
+SHA256 (qbittorrent-1.0.0beta6.tar.gz) =3D ee9852634d77fcb35f04510d6b0535a=
4cc6f5b4df73e9dd8e735542dcf5ca1b0
+SIZE (qbittorrent-1.0.0beta6.tar.gz) =3D 1270903
--MP_CGHWaHDGZtZAdU8dL/Oh1+_
Content-Type: text/x-patch; name=rblibtorrent-devel.diff
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=rblibtorrent-devel.diff
Index: rblibtorrent-devel/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/rblibtorrent-devel/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- rblibtorrent-devel/Makefile 24 Jul 2007 14:09:45 -0000 1.9
+++ rblibtorrent-devel/Makefile 11 Sep 2007 18:31:44 -0000
@@ -6,10 +6,9 @@
#
=20
PORTNAME=3D libtorrent
-PORTVERSION=3D 0.12
-PORTREVISION=3D 1
+DISTVERSION=3D 0.13~svn.r1520
CATEGORIES=3D net-p2p
-MASTER_SITES=3D SF
+MASTER_SITES=3D http://hydr0g3n.free.fr/qbittorrent/
PKGNAMEPREFIX=3D rb
PKGNAMESUFFIX=3D -devel
=20
@@ -28,4 +27,8 @@
libtorrent-devel-[0-9]* \
rblibtorrent-[0-9]*
=20
+post-install:
+ @cd ${PREFIX}/lib && ${MV} libtorrent-0.13.so libtorrent.so.1 && \
+ ${LN} -sf libtorrent.so.1 libtorrent.so
+
.include <bsd.port.mk>
Index: rblibtorrent-devel/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/rblibtorrent-devel/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- rblibtorrent-devel/distinfo 5 Jun 2007 05:52:00 -0000 1.5
+++ rblibtorrent-devel/distinfo 11 Sep 2007 18:31:44 -0000
@@ -1,3 +1,3 @@
-MD5 (libtorrent-0.12.tar.gz) =3D a09a37e6fc74d152821c00c3cb15d248
-SHA256 (libtorrent-0.12.tar.gz) =3D 0663f9adaa9d90334ebf78eb6f5b31074ff533=
d7bec5d3325ff98baad5b7df07
-SIZE (libtorrent-0.12.tar.gz) =3D 1176469
+MD5 (libtorrent-0.13~svn.r1520.tar.gz) =3D 1a6d2092e99d11d72f77736f35b2fb15
+SHA256 (libtorrent-0.13~svn.r1520.tar.gz) =3D 3644284398372a7f24d99dd60223=
ec039577c741f2de20e851922e1881f09955
+SIZE (libtorrent-0.13~svn.r1520.tar.gz) =3D 1882836
Index: rblibtorrent-devel/pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/rblibtorrent-devel/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- rblibtorrent-devel/pkg-plist 18 Apr 2007 00:34:07 -0000 1.7
+++ rblibtorrent-devel/pkg-plist 11 Sep 2007 18:31:44 -0000
@@ -1,6 +1,5 @@
include/libtorrent/alert.hpp
include/libtorrent/alert_types.hpp
-include/libtorrent/allocate_resources.hpp
include/libtorrent/asio.hpp
include/libtorrent/asio/basic_datagram_socket.hpp
include/libtorrent/asio/basic_deadline_timer.hpp
@@ -147,14 +146,15 @@
include/libtorrent/asio/thread.hpp
include/libtorrent/asio/time_traits.hpp
include/libtorrent/asio/write.hpp
-include/libtorrent/aux_/allocate_resources_impl.hpp
include/libtorrent/aux_/session_impl.hpp
include/libtorrent/bandwidth_manager.hpp
include/libtorrent/bencode.hpp
include/libtorrent/bt_peer_connection.hpp
include/libtorrent/buffer.hpp
include/libtorrent/config.hpp
+include/libtorrent/connection_queue.hpp
include/libtorrent/debug.hpp
+include/libtorrent/disk_io_thread.hpp
include/libtorrent/entry.hpp
include/libtorrent/escape_string.hpp
include/libtorrent/extensions.hpp
@@ -165,8 +165,12 @@
include/libtorrent/file_pool.hpp
include/libtorrent/fingerprint.hpp
include/libtorrent/hasher.hpp
+include/libtorrent/http_connection.hpp
+include/libtorrent/http_stream.hpp
include/libtorrent/http_tracker_connection.hpp
include/libtorrent/identify_client.hpp
+include/libtorrent/instantiate_connection.hpp
+include/libtorrent/intrusive_ptr_base.hpp
include/libtorrent/invariant_check.hpp
include/libtorrent/io.hpp
include/libtorrent/ip_filter.hpp
@@ -174,14 +178,20 @@
include/libtorrent/kademlia/dht_tracker.hpp
include/libtorrent/kademlia/find_data.hpp
include/libtorrent/kademlia/logging.hpp
+include/libtorrent/kademlia/msg.hpp
include/libtorrent/kademlia/node.hpp
include/libtorrent/kademlia/node_entry.hpp
include/libtorrent/kademlia/node_id.hpp
+include/libtorrent/kademlia/observer.hpp
include/libtorrent/kademlia/packet_iterator.hpp
include/libtorrent/kademlia/refresh.hpp
include/libtorrent/kademlia/routing_table.hpp
include/libtorrent/kademlia/rpc_manager.hpp
include/libtorrent/kademlia/traversal_algorithm.hpp
+include/libtorrent/lsd.hpp
+include/libtorrent/natpmp.hpp
+include/libtorrent/pch.hpp
+include/libtorrent/pe_crypto.hpp
include/libtorrent/peer.hpp
include/libtorrent/peer_connection.hpp
include/libtorrent/peer_id.hpp
@@ -190,23 +200,29 @@
include/libtorrent/piece_block_progress.hpp
include/libtorrent/piece_picker.hpp
include/libtorrent/policy.hpp
+include/libtorrent/proxy_base.hpp
include/libtorrent/random_sample.hpp
-include/libtorrent/resource_request.hpp
include/libtorrent/session.hpp
include/libtorrent/session_settings.hpp
include/libtorrent/session_status.hpp
include/libtorrent/size_type.hpp
include/libtorrent/socket.hpp
+include/libtorrent/socket_type.hpp
+include/libtorrent/socks4_stream.hpp
+include/libtorrent/socks5_stream.hpp
include/libtorrent/stat.hpp
include/libtorrent/storage.hpp
+include/libtorrent/time.hpp
include/libtorrent/torrent.hpp
include/libtorrent/torrent_handle.hpp
include/libtorrent/torrent_info.hpp
include/libtorrent/tracker_manager.hpp
include/libtorrent/udp_tracker_connection.hpp
include/libtorrent/utf8.hpp
+include/libtorrent/variant_stream.hpp
include/libtorrent/version.hpp
include/libtorrent/web_peer_connection.hpp
+include/libtorrent/xml_parse.hpp
lib/libtorrent.a
lib/libtorrent.la
lib/libtorrent.so
Index: rblibtorrent-devel/files/patch-socket_ops.hpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/net-p2p/rblibtorrent-devel/files/patch-socket_op=
s.hpp,v
retrieving revision 1.1
diff -u -r1.1 patch-socket_ops.hpp
--- rblibtorrent-devel/files/patch-socket_ops.hpp 5 Jun 2007 09:42:04 -0000=
1.1
+++ rblibtorrent-devel/files/patch-socket_ops.hpp 11 Sep 2007 18:31:44 -0000
@@ -1,10 +1,11 @@
---- include/libtorrent/asio/detail/socket_ops.hpp Wed May 16 00:35:55=
2007
-+++ include/libtorrent/asio/detail/socket_ops.hpp.orig Wed May 16 00:35:45=
2007
-66c66
-< #if defined(__MACH__) && defined(__APPLE__)
----
-> #if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
-298c298
-< #elif defined(__MACH__) && defined(__APPLE__)
----
-> #elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)=20
+--- include/libtorrent/asio/detail/socket_ops.hpp.orig Wed Aug 8 03:43:42=
2007
++++ include/libtorrent/asio/detail/socket_ops.hpp Mon Sep 10 12:46:17 2007
+@@ -715,7 +715,7 @@
+ if (error)
+ ec =3D translate_netdb_error(error);
+ return retval;
+-#elif defined(__MACH__) && defined(__APPLE__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)=20
+ (void)(buffer);
+ (void)(buflength);
+ int error =3D 0;
Index: rblibtorrent-devel/files/patch-src__storage.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: rblibtorrent-devel/files/patch-src__storage.cpp
diff -N rblibtorrent-devel/files/patch-src__storage.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rblibtorrent-devel/files/patch-src__storage.cpp 11 Sep 2007 18:31:44 -0=
000
@@ -0,0 +1,15 @@
+--- src/storage.cpp.orig Sat Aug 25 15:26:43 2007
++++ src/storage.cpp Mon Sep 10 12:51:23 2007
+@@ -75,9 +75,11 @@
+ #include <cstdio>
+ #endif
+=20
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ // for getattrlist()
++#ifdef __APPLE__
+ #include <sys/attr.h>
++#endif
+ #include <unistd.h>
+ // for statfs()
+ #include <sys/param.h>
--MP_CGHWaHDGZtZAdU8dL/Oh1+_--
--Sig_Q5MkJ4//_142IKin29kVZeg
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFG5uATiV05EpRcP2ERAn6SAKCw1z/VrXsfVXVmFUtE8JiM+GdEKQCdGF+/
IYfC2YOYLKLOADkSvo/lDTM=
=eCER
-----END PGP SIGNATURE-----
--Sig_Q5MkJ4//_142IKin29kVZeg--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070911153602.3ecf6182>