From 705b8ec88413a337c23199ee42bc00cfca61b73e Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 20 Dec 2010 02:16:56 +0000 Subject: [PATCH] update the Mac project and libevent files --- Transmission.xcodeproj/project.pbxproj | 137 +++++++------ third-party/macosx-libevent-config.h | 189 +++++++++++++++-- third-party/macosx-libevent-event-config.h | 223 +++++++++++++++++---- 3 files changed, 434 insertions(+), 115 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index bce1d599b..2925002ad 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 4D36BA790CA2F00800A63CA5 /* peer-msgs.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D36BA6A0CA2F00800A63CA5 /* peer-msgs.c */; }; 4D36BA7A0CA2F00800A63CA5 /* peer-msgs.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D36BA6B0CA2F00800A63CA5 /* peer-msgs.h */; }; 4D36BA7B0CA2F00800A63CA5 /* ptrarray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D36BA6C0CA2F00800A63CA5 /* ptrarray.h */; }; - 4D36BBC90CA309AA00A63CA5 /* evutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D36BBC80CA309AA00A63CA5 /* evutil.c */; }; 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; }; 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */ = {isa = PBXBuildFile; fileRef = A2D3078E0D9EC45F0051FD27 /* blocklist.c */; }; 4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; @@ -48,7 +47,6 @@ 4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; }; 4DA6FDC5091141AD00450CB1 /* ResumeOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDC3091141AD00450CB1 /* ResumeOff.png */; }; 4DA6FDC6091141AD00450CB1 /* ResumeOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDC4091141AD00450CB1 /* ResumeOn.png */; }; - 4DB74EF20E8CD6FA00AEB1A8 /* http.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DB74EF10E8CD6FA00AEB1A8 /* http.c */; }; 4DB74F080E8CD75100AEB1A8 /* wildmat.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DB74F070E8CD75100AEB1A8 /* wildmat.c */; }; 4DCCBB3E09C3D71100D3CABF /* TorrentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */; }; 4DDFDD22099A5D8E00189D81 /* DownloadBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */; }; @@ -70,6 +68,24 @@ A2012AE20D77151D0056FD71 /* YingYangGroupTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A2012AE10D77151D0056FD71 /* YingYangGroupTemplate.png */; }; A20152640D1C1BE70081714F /* PinTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20152630D1C1BE70081714F /* PinTemplate.png */; }; A201527E0D1C270F0081714F /* torrent-ctor.c in Sources */ = {isa = PBXBuildFile; fileRef = A20152790D1C26EB0081714F /* torrent-ctor.c */; }; + A2074F4C12BEA8CE00F70985 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F4B12BEA8CE00F70985 /* buffer.c */; }; + A2074F5912BEA8E000F70985 /* bufferevent_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F5012BEA8E000F70985 /* bufferevent_filter.c */; }; + A2074F5A12BEA8E000F70985 /* bufferevent_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F5112BEA8E000F70985 /* bufferevent_openssl.c */; }; + A2074F5B12BEA8E000F70985 /* bufferevent_pair.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F5212BEA8E000F70985 /* bufferevent_pair.c */; }; + A2074F5D12BEA8E000F70985 /* bufferevent_sock.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F5412BEA8E000F70985 /* bufferevent_sock.c */; }; + A2074F5E12BEA8E000F70985 /* bufferevent.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F5512BEA8E000F70985 /* bufferevent.c */; }; + A2074F7412BEAA3300F70985 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F7312BEAA3300F70985 /* event.c */; }; + A2074F8512BEAA6600F70985 /* evmap.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F8412BEAA6600F70985 /* evmap.c */; }; + A2074F9912BEAAAF00F70985 /* evthread.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074F9812BEAAAF00F70985 /* evthread.c */; }; + A2074FA312BEAAC600F70985 /* evutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FA212BEAAC600F70985 /* evutil.c */; }; + A2074FAB12BEAAFF00F70985 /* http.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FAA12BEAAFF00F70985 /* http.c */; }; + A2074FB712BEAB1E00F70985 /* listener.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FB612BEAB1E00F70985 /* listener.c */; }; + A2074FBF12BEAB9A00F70985 /* kqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FBE12BEAB9A00F70985 /* kqueue.c */; }; + A2074FC712BEABC800F70985 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FC612BEABC800F70985 /* log.c */; }; + A2074FDE12BEAC5000F70985 /* signal.c in Sources */ = {isa = PBXBuildFile; fileRef = A2074FDD12BEAC5000F70985 /* signal.c */; }; + A207503512BEAD9C00F70985 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = A207503412BEAD9C00F70985 /* select.c */; }; + A207503712BEADA200F70985 /* poll.c in Sources */ = {isa = PBXBuildFile; fileRef = A207503612BEADA200F70985 /* poll.c */; }; + A20750B812BEB66900F70985 /* bufferevent_ratelim.c in Sources */ = {isa = PBXBuildFile; fileRef = A20750B712BEB66900F70985 /* bufferevent_ratelim.c */; }; A2085DDC0C53BC74000BC3B7 /* AboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */; }; A209EAC61142CF28002B02D1 /* InfoActivityViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A209EAC31142CF28002B02D1 /* InfoActivityViewController.m */; }; A209EAC71142CF28002B02D1 /* InfoGeneralViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A209EAC51142CF28002B02D1 /* InfoGeneralViewController.m */; }; @@ -222,8 +238,6 @@ A2AAB65E0DE0CF6200E04DDA /* rpc-server.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AAB65A0DE0CF6200E04DDA /* rpc-server.h */; }; A2AAB65F0DE0CF6200E04DDA /* rpcimpl.c in Sources */ = {isa = PBXBuildFile; fileRef = A2AAB65B0DE0CF6200E04DDA /* rpcimpl.c */; }; A2AAB6650DE0D08B00E04DDA /* blocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D307930D9EC4860051FD27 /* blocklist.h */; }; - A2ABA6DB11094917009C40BA /* evdns.c in Sources */ = {isa = PBXBuildFile; fileRef = A2ABA6D911094917009C40BA /* evdns.c */; }; - A2ABA6DC11094917009C40BA /* evdns.h in Headers */ = {isa = PBXBuildFile; fileRef = A2ABA6DA11094917009C40BA /* evdns.h */; }; A2AF1C390A3D0F6200F1575D /* FileOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */; }; A2B3FB460E5901E700FF78FB /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B3FB450E5901E700FF78FB /* cli.c */; }; A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -286,14 +300,6 @@ BE11836F0CE160D50002D0F3 /* upnpcommands.c in Sources */ = {isa = PBXBuildFile; fileRef = BE1183670CE160D50002D0F3 /* upnpcommands.c */; }; BE1183700CE160D50002D0F3 /* miniupnpc.c in Sources */ = {isa = PBXBuildFile; fileRef = BE1183680CE160D50002D0F3 /* miniupnpc.c */; }; BE1183780CE161390002D0F3 /* libminiupnp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1183480CE160960002D0F3 /* libminiupnp.a */; }; - BE75C3650C72A0EF00DBEFE0 /* kqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3580C72A0EF00DBEFE0 /* kqueue.c */; }; - BE75C3660C72A0EF00DBEFE0 /* signal.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3590C72A0EF00DBEFE0 /* signal.c */; }; - BE75C3670C72A0EF00DBEFE0 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C35A0C72A0EF00DBEFE0 /* buffer.c */; }; - BE75C3680C72A0EF00DBEFE0 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C35B0C72A0EF00DBEFE0 /* log.c */; }; - BE75C36A0C72A0EF00DBEFE0 /* evbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C35D0C72A0EF00DBEFE0 /* evbuffer.c */; }; - BE75C36B0C72A0EF00DBEFE0 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C35E0C72A0EF00DBEFE0 /* event.c */; }; - BE75C3700C72A0EF00DBEFE0 /* poll.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3630C72A0EF00DBEFE0 /* poll.c */; }; - BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3640C72A0EF00DBEFE0 /* select.c */; }; BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE75C3490C729E9500DBEFE0 /* libevent.a */; }; BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; @@ -455,7 +461,6 @@ 4D36BA6A0CA2F00800A63CA5 /* peer-msgs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = "peer-msgs.c"; path = "libtransmission/peer-msgs.c"; sourceTree = ""; }; 4D36BA6B0CA2F00800A63CA5 /* peer-msgs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "peer-msgs.h"; path = "libtransmission/peer-msgs.h"; sourceTree = ""; }; 4D36BA6C0CA2F00800A63CA5 /* ptrarray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ptrarray.h; path = libtransmission/ptrarray.h; sourceTree = ""; }; - 4D36BBC80CA309AA00A63CA5 /* evutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = evutil.c; path = "third-party/libevent/evutil.c"; sourceTree = ""; }; 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 4D6DAAC4090CE00500F43C22 /* RevealOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOff.png; path = macosx/Images/RevealOff.png; sourceTree = ""; }; 4D6DAAC5090CE00500F43C22 /* RevealOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOn.png; path = macosx/Images/RevealOn.png; sourceTree = ""; }; @@ -467,7 +472,6 @@ 4DA6FDB90911233800450CB1 /* PauseOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOff.png; path = macosx/Images/PauseOff.png; sourceTree = ""; }; 4DA6FDC3091141AD00450CB1 /* ResumeOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeOff.png; path = macosx/Images/ResumeOff.png; sourceTree = ""; }; 4DA6FDC4091141AD00450CB1 /* ResumeOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeOn.png; path = macosx/Images/ResumeOn.png; sourceTree = ""; }; - 4DB74EF10E8CD6FA00AEB1A8 /* http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = http.c; path = "third-party/libevent/http.c"; sourceTree = ""; }; 4DB74F070E8CD75100AEB1A8 /* wildmat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wildmat.c; path = libtransmission/wildmat.c; sourceTree = ""; }; 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = ""; }; 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = ""; }; @@ -501,6 +505,24 @@ A202FF5F0DDA9275009938FF /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = macosx/it.lproj/Localizable.strings; sourceTree = ""; }; A202FF600DDA9275009938FF /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = macosx/it.lproj/MainMenu.xib; sourceTree = ""; }; A202FF610DDA9275009938FF /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = macosx/it.lproj/PrefsWindow.xib; sourceTree = ""; }; + A2074F4B12BEA8CE00F70985 /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buffer.c; path = "third-party/libevent/buffer.c"; sourceTree = ""; }; + A2074F5012BEA8E000F70985 /* bufferevent_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent_filter.c; path = "third-party/libevent/bufferevent_filter.c"; sourceTree = ""; }; + A2074F5112BEA8E000F70985 /* bufferevent_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent_openssl.c; path = "third-party/libevent/bufferevent_openssl.c"; sourceTree = ""; }; + A2074F5212BEA8E000F70985 /* bufferevent_pair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent_pair.c; path = "third-party/libevent/bufferevent_pair.c"; sourceTree = ""; }; + A2074F5412BEA8E000F70985 /* bufferevent_sock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent_sock.c; path = "third-party/libevent/bufferevent_sock.c"; sourceTree = ""; }; + A2074F5512BEA8E000F70985 /* bufferevent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent.c; path = "third-party/libevent/bufferevent.c"; sourceTree = ""; }; + A2074F7312BEAA3300F70985 /* event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = event.c; path = "third-party/libevent/event.c"; sourceTree = ""; }; + A2074F8412BEAA6600F70985 /* evmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evmap.c; path = "third-party/libevent/evmap.c"; sourceTree = ""; }; + A2074F9812BEAAAF00F70985 /* evthread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evthread.c; path = "third-party/libevent/evthread.c"; sourceTree = ""; }; + A2074FA212BEAAC600F70985 /* evutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evutil.c; path = "third-party/libevent/evutil.c"; sourceTree = ""; }; + A2074FAA12BEAAFF00F70985 /* http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = http.c; path = "third-party/libevent/http.c"; sourceTree = ""; }; + A2074FB612BEAB1E00F70985 /* listener.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = listener.c; path = "third-party/libevent/listener.c"; sourceTree = ""; }; + A2074FBE12BEAB9A00F70985 /* kqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = kqueue.c; path = "third-party/libevent/kqueue.c"; sourceTree = ""; }; + A2074FC612BEABC800F70985 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log.c; path = "third-party/libevent/log.c"; sourceTree = ""; }; + A2074FDD12BEAC5000F70985 /* signal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = signal.c; path = "third-party/libevent/signal.c"; sourceTree = ""; }; + A207503412BEAD9C00F70985 /* select.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = select.c; path = "third-party/libevent/select.c"; sourceTree = ""; }; + A207503612BEADA200F70985 /* poll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = poll.c; path = "third-party/libevent/poll.c"; sourceTree = ""; }; + A20750B712BEB66900F70985 /* bufferevent_ratelim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufferevent_ratelim.c; path = "third-party/libevent/bufferevent_ratelim.c"; sourceTree = ""; }; A2085DD90C53BC74000BC3B7 /* AboutWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutWindowController.h; path = macosx/AboutWindowController.h; sourceTree = ""; }; A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AboutWindowController.m; path = macosx/AboutWindowController.m; sourceTree = ""; }; A209EAC21142CF28002B02D1 /* InfoActivityViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoActivityViewController.h; path = macosx/InfoActivityViewController.h; sourceTree = ""; }; @@ -760,8 +782,6 @@ A2AAB6590DE0CF6200E04DDA /* rpcimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpcimpl.h; path = libtransmission/rpcimpl.h; sourceTree = ""; }; A2AAB65A0DE0CF6200E04DDA /* rpc-server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "rpc-server.h"; path = "libtransmission/rpc-server.h"; sourceTree = ""; }; A2AAB65B0DE0CF6200E04DDA /* rpcimpl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rpcimpl.c; path = libtransmission/rpcimpl.c; sourceTree = ""; }; - A2ABA6D911094917009C40BA /* evdns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evdns.c; path = "third-party/libevent/evdns.c"; sourceTree = ""; }; - A2ABA6DA11094917009C40BA /* evdns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = evdns.h; path = "third-party/libevent/evdns.h"; sourceTree = ""; }; A2AC81D60D987E2D00A2878C /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/AddWindow.xib; sourceTree = ""; }; A2AF1C360A3D0F6200F1575D /* FileOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileOutlineView.h; path = macosx/FileOutlineView.h; sourceTree = ""; }; A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileOutlineView.m; path = macosx/FileOutlineView.m; sourceTree = ""; }; @@ -773,7 +793,6 @@ A2B9F90611BD10BE003FC8CA /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = macosx/fr.lproj/InfoOptionsView.xib; sourceTree = ""; }; A2BB67780D5BA74600AB0618 /* ToolbarOpenWebTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ToolbarOpenWebTemplate.png; path = macosx/Images/ToolbarOpenWebTemplate.png; sourceTree = ""; }; A2BC19840CA9AF5A00DD302A /* CompleteCheck.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CompleteCheck.png; path = macosx/Images/CompleteCheck.png; sourceTree = ""; }; - A2BC19DF0CA9D82300DD302A /* evutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = evutil.h; path = "third-party/libevent/evutil.h"; sourceTree = ""; }; A2BE9C4E0C1E4ADA002D16E6 /* makemeta.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = makemeta.c; path = libtransmission/makemeta.c; sourceTree = ""; }; A2BE9C4F0C1E4ADA002D16E6 /* makemeta.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = makemeta.h; path = libtransmission/makemeta.h; sourceTree = ""; }; A2C0C5020E02CB6100D95339 /* Remote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Remote.png; path = macosx/Images/Remote.png; sourceTree = ""; }; @@ -853,16 +872,6 @@ BE1183670CE160D50002D0F3 /* upnpcommands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = upnpcommands.c; path = "third-party/miniupnp/upnpcommands.c"; sourceTree = ""; }; BE1183680CE160D50002D0F3 /* miniupnpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = miniupnpc.c; path = "third-party/miniupnp/miniupnpc.c"; sourceTree = ""; }; BE75C3490C729E9500DBEFE0 /* libevent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libevent.a; sourceTree = BUILT_PRODUCTS_DIR; }; - BE75C3580C72A0EF00DBEFE0 /* kqueue.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = kqueue.c; path = "third-party/libevent/kqueue.c"; sourceTree = ""; }; - BE75C3590C72A0EF00DBEFE0 /* signal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = signal.c; path = "third-party/libevent/signal.c"; sourceTree = ""; }; - BE75C35A0C72A0EF00DBEFE0 /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = buffer.c; path = "third-party/libevent/buffer.c"; sourceTree = ""; }; - BE75C35B0C72A0EF00DBEFE0 /* log.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = log.c; path = "third-party/libevent/log.c"; sourceTree = ""; }; - BE75C35D0C72A0EF00DBEFE0 /* evbuffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = evbuffer.c; path = "third-party/libevent/evbuffer.c"; sourceTree = ""; }; - BE75C35E0C72A0EF00DBEFE0 /* event.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = event.c; path = "third-party/libevent/event.c"; sourceTree = ""; }; - BE75C3630C72A0EF00DBEFE0 /* poll.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = poll.c; path = "third-party/libevent/poll.c"; sourceTree = ""; }; - BE75C3640C72A0EF00DBEFE0 /* select.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = select.c; path = "third-party/libevent/select.c"; sourceTree = ""; }; - BE75C3810C72A1C100DBEFE0 /* evhttp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = evhttp.h; path = "third-party/libevent/evhttp.h"; sourceTree = ""; }; - BE75C3840C72A1C100DBEFE0 /* event.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = event.h; path = "third-party/libevent/event.h"; sourceTree = ""; }; BEFC1C000C07750000B0BB3C /* transmission-daemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "transmission-daemon"; sourceTree = BUILT_PRODUCTS_DIR; }; BEFC1C0E0C07756200B0BB3C /* daemon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = daemon.c; path = daemon/daemon.c; sourceTree = ""; }; BEFC1C140C07756200B0BB3C /* remote.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = remote.c; path = daemon/remote.c; sourceTree = ""; }; @@ -1439,21 +1448,24 @@ BE75C3570C72A0D600DBEFE0 /* libevent */ = { isa = PBXGroup; children = ( - A2BC19DF0CA9D82300DD302A /* evutil.h */, - BE75C3810C72A1C100DBEFE0 /* evhttp.h */, - BE75C3840C72A1C100DBEFE0 /* event.h */, - A2ABA6DA11094917009C40BA /* evdns.h */, - 4D36BBC80CA309AA00A63CA5 /* evutil.c */, - BE75C3580C72A0EF00DBEFE0 /* kqueue.c */, - BE75C3590C72A0EF00DBEFE0 /* signal.c */, - BE75C35A0C72A0EF00DBEFE0 /* buffer.c */, - BE75C35B0C72A0EF00DBEFE0 /* log.c */, - BE75C35D0C72A0EF00DBEFE0 /* evbuffer.c */, - BE75C35E0C72A0EF00DBEFE0 /* event.c */, - BE75C3630C72A0EF00DBEFE0 /* poll.c */, - BE75C3640C72A0EF00DBEFE0 /* select.c */, - 4DB74EF10E8CD6FA00AEB1A8 /* http.c */, - A2ABA6D911094917009C40BA /* evdns.c */, + A2074F4B12BEA8CE00F70985 /* buffer.c */, + A2074F5012BEA8E000F70985 /* bufferevent_filter.c */, + A2074F5112BEA8E000F70985 /* bufferevent_openssl.c */, + A2074F5212BEA8E000F70985 /* bufferevent_pair.c */, + A20750B712BEB66900F70985 /* bufferevent_ratelim.c */, + A2074F5412BEA8E000F70985 /* bufferevent_sock.c */, + A2074F5512BEA8E000F70985 /* bufferevent.c */, + A2074F7312BEAA3300F70985 /* event.c */, + A2074F8412BEAA6600F70985 /* evmap.c */, + A2074F9812BEAAAF00F70985 /* evthread.c */, + A2074FA212BEAAC600F70985 /* evutil.c */, + A2074FAA12BEAAFF00F70985 /* http.c */, + A2074FBE12BEAB9A00F70985 /* kqueue.c */, + A2074FB612BEAB1E00F70985 /* listener.c */, + A2074FC612BEABC800F70985 /* log.c */, + A207503612BEADA200F70985 /* poll.c */, + A207503412BEAD9C00F70985 /* select.c */, + A2074FDD12BEAC5000F70985 /* signal.c */, ); name = libevent; sourceTree = ""; @@ -1644,7 +1656,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - A2ABA6DC11094917009C40BA /* evdns.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2016,7 +2027,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "if [ ! -e ./third-party/libevent/config.h -a ! ./third-party/macosx-libevent-config.h -ef ./third-party/libevent/config.h ]; then ln -s ../macosx-libevent-config.h ./third-party/libevent/config.h; fi\n\nif [ ! -e ./third-party/libevent/event-config.h -a ! ./third-party/macosx-libevent-event-config.h -ef ./third-party/libevent/event-config.h ]; then ln -s ../macosx-libevent-event-config.h ./third-party/libevent/event-config.h; fi"; + shellScript = "if [ ! -e ./third-party/libevent/include/event2/config.h -a ! ./third-party/macosx-libevent-config.h -ef ./third-party/libevent/include/event2/config.h ]; then ln -s ../../../macosx-libevent-config.h ./third-party/libevent/include/event2/config.h; fi\n\nif [ ! -e ./third-party/libevent/include/event2/event-config.h -a ! ./third-party/macosx-libevent-event-config.h -ef ./third-party/libevent/include/event2/event-config.h ]; then ln -s ../../../macosx-libevent-event-config.h ./third-party/libevent/include/event2/event-config.h; fi"; }; /* End PBXShellScriptBuildPhase section */ @@ -2188,17 +2199,24 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BE75C3650C72A0EF00DBEFE0 /* kqueue.c in Sources */, - BE75C3660C72A0EF00DBEFE0 /* signal.c in Sources */, - BE75C3670C72A0EF00DBEFE0 /* buffer.c in Sources */, - BE75C3680C72A0EF00DBEFE0 /* log.c in Sources */, - BE75C36A0C72A0EF00DBEFE0 /* evbuffer.c in Sources */, - BE75C36B0C72A0EF00DBEFE0 /* event.c in Sources */, - BE75C3700C72A0EF00DBEFE0 /* poll.c in Sources */, - BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */, - 4D36BBC90CA309AA00A63CA5 /* evutil.c in Sources */, - 4DB74EF20E8CD6FA00AEB1A8 /* http.c in Sources */, - A2ABA6DB11094917009C40BA /* evdns.c in Sources */, + A2074F4C12BEA8CE00F70985 /* buffer.c in Sources */, + A2074F5912BEA8E000F70985 /* bufferevent_filter.c in Sources */, + A2074F5A12BEA8E000F70985 /* bufferevent_openssl.c in Sources */, + A2074F5B12BEA8E000F70985 /* bufferevent_pair.c in Sources */, + A2074F5D12BEA8E000F70985 /* bufferevent_sock.c in Sources */, + A2074F5E12BEA8E000F70985 /* bufferevent.c in Sources */, + A2074F7412BEAA3300F70985 /* event.c in Sources */, + A2074F8512BEAA6600F70985 /* evmap.c in Sources */, + A2074F9912BEAAAF00F70985 /* evthread.c in Sources */, + A2074FA312BEAAC600F70985 /* evutil.c in Sources */, + A2074FAB12BEAAFF00F70985 /* http.c in Sources */, + A2074FB712BEAB1E00F70985 /* listener.c in Sources */, + A2074FBF12BEAB9A00F70985 /* kqueue.c in Sources */, + A2074FC712BEABC800F70985 /* log.c in Sources */, + A2074FDE12BEAC5000F70985 /* signal.c in Sources */, + A207503512BEAD9C00F70985 /* select.c in Sources */, + A207503712BEADA200F70985 /* poll.c in Sources */, + A20750B812BEB66900F70985 /* bufferevent_ratelim.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2468,7 +2486,7 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES; OTHER_CFLAGS = "-DHAVE_CONFIG_H"; PRODUCT_NAME = event; - USER_HEADER_SEARCH_PATHS = "third-party/libevent"; + USER_HEADER_SEARCH_PATHS = "third-party/libevent/compat third-party/libevent/include"; }; name = Debug; }; @@ -2479,6 +2497,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "third-party/shttpd", + "third-party/libevent/include", "third-party/libevent", "third-party", ); @@ -2677,6 +2696,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "third-party/shttpd", + "third-party/libevent/include", "third-party/libevent", "third-party", ); @@ -2922,6 +2942,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "third-party/shttpd", + "third-party/libevent/include", "third-party/libevent", "third-party", ); @@ -2984,7 +3005,7 @@ GCC_DEBUGGING_SYMBOLS = full; OTHER_CFLAGS = "-DHAVE_CONFIG_H"; PRODUCT_NAME = event; - USER_HEADER_SEARCH_PATHS = "third-party/libevent"; + USER_HEADER_SEARCH_PATHS = "third-party/libevent/compat third-party/libevent/include"; }; name = "Release - Debug"; }; @@ -3051,7 +3072,7 @@ buildSettings = { OTHER_CFLAGS = "-DHAVE_CONFIG_H"; PRODUCT_NAME = event; - USER_HEADER_SEARCH_PATHS = "third-party/libevent"; + USER_HEADER_SEARCH_PATHS = "third-party/libevent/compat third-party/libevent/include"; }; name = Release; }; diff --git a/third-party/macosx-libevent-config.h b/third-party/macosx-libevent-config.h index 284b027ff..d2b17a015 100644 --- a/third-party/macosx-libevent-config.h +++ b/third-party/macosx-libevent-config.h @@ -1,15 +1,43 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if clock_gettime is available in libc */ -/* #undef DNS_USE_CPU_CLOCK_FOR_ID */ +/* Define if libevent should build without support for a debug mode */ +/* #undef DISABLE_DEBUG_MODE */ -/* Define is no secure id variant is available */ -#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 +/* Define if libevent should not allow replacing the mm functions */ +/* #undef DISABLE_MM_REPLACEMENT */ + +/* Define if libevent should not be compiled with thread support */ +/* #undef DISABLE_THREAD_SUPPORT */ + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +/* #undef HAVE_ARC4RANDOM_BUF */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 /* Define to 1 if you have the `clock_gettime' function. */ /* #undef HAVE_CLOCK_GETTIME */ +/* Define to 1 if you have the declaration of `CTL_KERN', and to 0 if you + don't. */ +#define HAVE_DECL_CTL_KERN 1 + +/* Define to 1 if you have the declaration of `KERN_ARND', and to 0 if you + don't. */ +#define HAVE_DECL_KERN_ARND 0 + +/* Define to 1 if you have the declaration of `KERN_RANDOM', and to 0 if you + don't. */ +#define HAVE_DECL_KERN_RANDOM 0 + +/* Define to 1 if you have the declaration of `RANDOM_UUID', and to 0 if you + don't. */ +#define HAVE_DECL_RANDOM_UUID 0 + /* Define if /dev/poll is available */ /* #undef HAVE_DEVPOLL */ @@ -22,6 +50,9 @@ /* Define to 1 if you have the `epoll_ctl' function. */ /* #undef HAVE_EPOLL_CTL */ +/* Define to 1 if you have the `eventfd' function. */ +/* #undef HAVE_EVENTFD */ + /* Define if your system supports event ports */ /* #undef HAVE_EVENT_PORTS */ @@ -43,15 +74,39 @@ /* Define to 1 if you have the `geteuid' function. */ #define HAVE_GETEUID 1 +/* Define this if you have any gethostbyname_r() */ +/* #undef HAVE_GETHOSTBYNAME_R */ + +/* Define this if gethostbyname_r takes 3 arguments */ +/* #undef HAVE_GETHOSTBYNAME_R_3_ARG */ + +/* Define this if gethostbyname_r takes 5 arguments */ +/* #undef HAVE_GETHOSTBYNAME_R_5_ARG */ + +/* Define this if gethostbyname_r takes 6 arguments */ +/* #undef HAVE_GETHOSTBYNAME_R_6_ARG */ + /* Define to 1 if you have the `getnameinfo' function. */ #define HAVE_GETNAMEINFO 1 +/* Define to 1 if you have the `getprotobynumber' function. */ +#define HAVE_GETPROTOBYNUMBER 1 + +/* Define to 1 if you have the `getservbyname' function. */ +#define HAVE_GETSERVBYNAME 1 + /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 + /* Define to 1 if you have the `inet_ntop' function. */ #define HAVE_INET_NTOP 1 +/* Define to 1 if you have the `inet_pton' function. */ +#define HAVE_INET_PTON 1 + /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -61,24 +116,30 @@ /* Define to 1 if you have the `kqueue' function. */ #define HAVE_KQUEUE 1 -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -#define HAVE_LIBRESOLV 1 - -/* Define to 1 if you have the `rt' library (-lrt). */ -/* #undef HAVE_LIBRT */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ +/* Define if the system has zlib */ +#define HAVE_LIBZ 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_NETINET_IN6_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define if the system has openssl */ +#define HAVE_OPENSSL 1 + +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + /* Define to 1 if you have the `poll' function. */ #define HAVE_POLL 1 @@ -91,9 +152,27 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_PORT_H */ +/* Define if you have POSIX threads libraries and header files. */ +/* #undef HAVE_PTHREAD */ + +/* Define if we have pthreads on this system */ +#define HAVE_PTHREADS 1 + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if the system has the type `sa_family_t'. */ +#define HAVE_SA_FAMILY_T 1 + /* Define to 1 if you have the `select' function. */ #define HAVE_SELECT 1 +/* Define to 1 if you have the `sendfile' function. */ +#define HAVE_SENDFILE 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + /* Define if F_SETFD is defined in */ #define HAVE_SETFD 1 @@ -103,12 +182,15 @@ /* Define to 1 if you have the `signal' function. */ #define HAVE_SIGNAL 1 -/* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 +/* Define to 1 if you have the `splice' function. */ +/* #undef HAVE_SPLICE */ /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -133,21 +215,51 @@ /* Define to 1 if you have the `strtoll' function. */ #define HAVE_STRTOLL 1 +/* Define to 1 if the system has the type `struct addrinfo'. */ +#define HAVE_STRUCT_ADDRINFO 1 + /* Define to 1 if the system has the type `struct in6_addr'. */ #define HAVE_STRUCT_IN6_ADDR 1 +/* Define to 1 if `s6_addr16' is a member of `struct in6_addr'. */ +/* #undef HAVE_STRUCT_IN6_ADDR_S6_ADDR16 */ + +/* Define to 1 if `s6_addr32' is a member of `struct in6_addr'. */ +/* #undef HAVE_STRUCT_IN6_ADDR_S6_ADDR32 */ + +/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +#define HAVE_STRUCT_SOCKADDR_IN6 1 + +/* Define to 1 if `sin6_len' is a member of `struct sockaddr_in6'. */ +#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1 + +/* Define to 1 if `sin_len' is a member of `struct sockaddr_in'. */ +#define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1 + +/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ +#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 + +/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */ +/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_DEVPOLL_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_EPOLL_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_EVENTFD_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_EVENT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 @@ -157,18 +269,30 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_SELECT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SENDFILE_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_SOCKET_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCTL_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + /* Define if TAILQ_FOREACH is defined in */ #define HAVE_TAILQFOREACH 1 @@ -196,9 +320,15 @@ /* Define to 1 if the system has the type `uint8_t'. */ #define HAVE_UINT8_T 1 +/* Define to 1 if the system has the type `uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `unsetenv' function. */ +#define HAVE_UNSETENV 1 + /* Define to 1 if you have the `vasprintf' function. */ #define HAVE_VASPRINTF 1 @@ -210,7 +340,7 @@ #define LT_OBJDIR ".libs/" /* Numeric representation of the version */ -#define NUMERIC_VERSION 0x01040d01 +#define NUMERIC_VERSION 0x02000a00 /* Name of package */ #define PACKAGE "libevent" @@ -227,21 +357,37 @@ /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "" +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 +#define SIZEOF_LONG 8 /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 +/* The size of `pthread_t', as computed by sizeof. */ +#define SIZEOF_PTHREAD_T 8 + /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* The size of `void *', as computed by sizeof. */ +#define SIZEOF_VOID_P 8 + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -249,7 +395,7 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "1.4.13-stable-dev" +#define VERSION "2.0.10-stable" /* Define to appropriate substitue if compiler doesnt have __func__ */ /* #undef __func__ */ @@ -271,3 +417,6 @@ /* Define to unsigned int if you dont have it */ /* #undef socklen_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ diff --git a/third-party/macosx-libevent-event-config.h b/third-party/macosx-libevent-event-config.h index bccf3bf13..c23dbfaa0 100644 --- a/third-party/macosx-libevent-event-config.h +++ b/third-party/macosx-libevent-event-config.h @@ -8,29 +8,60 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if clock_gettime is available in libc */ -/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */ +/* Define if libevent should build without support for a debug mode */ +/* #under _EVENT_DISABLE_DEBUG_MODE */ -/* Define is no secure id variant is available */ -#define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 +/* Define if libevent should not allow replacing the mm functions */ +/* #under _EVENT_DISABLE_MM_REPLACEMENT */ + +/* Define if libevent should not be compiled with thread support */ +/* #under _EVENT_DISABLE_THREAD_SUPPORT */ + +/* Define to 1 if you have the `arc4random' function. */ +#define _EVENT_HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +/* #under _EVENT_HAVE_ARC4RANDOM_BUF */ + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_ARPA_INET_H 1 /* Define to 1 if you have the `clock_gettime' function. */ -/* #undef _EVENT_HAVE_CLOCK_GETTIME */ +/* #under _EVENT_HAVE_CLOCK_GETTIME */ + +/* Define to 1 if you have the declaration of `CTL_KERN', and to 0 if you + don't. */ +#define _EVENT_HAVE_DECL_CTL_KERN 1 + +/* Define to 1 if you have the declaration of `KERN_ARND', and to 0 if you + don't. */ +#define _EVENT_HAVE_DECL_KERN_ARND 0 + +/* Define to 1 if you have the declaration of `KERN_RANDOM', and to 0 if you + don't. */ +#define _EVENT_HAVE_DECL_KERN_RANDOM 0 + +/* Define to 1 if you have the declaration of `RANDOM_UUID', and to 0 if you + don't. */ +#define _EVENT_HAVE_DECL_RANDOM_UUID 0 /* Define if /dev/poll is available */ -/* #undef _EVENT_HAVE_DEVPOLL */ +/* #under _EVENT_HAVE_DEVPOLL */ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_DLFCN_H 1 /* Define if your system supports the epoll system calls */ -/* #undef _EVENT_HAVE_EPOLL */ +/* #under _EVENT_HAVE_EPOLL */ /* Define to 1 if you have the `epoll_ctl' function. */ -/* #undef _EVENT_HAVE_EPOLL_CTL */ +/* #under _EVENT_HAVE_EPOLL_CTL */ + +/* Define to 1 if you have the `eventfd' function. */ +/* #under _EVENT_HAVE_EVENTFD */ /* Define if your system supports event ports */ -/* #undef _EVENT_HAVE_EVENT_PORTS */ +/* #under _EVENT_HAVE_EVENT_PORTS */ /* Define to 1 if you have the `fcntl' function. */ #define _EVENT_HAVE_FCNTL 1 @@ -50,15 +81,39 @@ /* Define to 1 if you have the `geteuid' function. */ #define _EVENT_HAVE_GETEUID 1 +/* Define this if you have any gethostbyname_r() */ +/* #under _EVENT_HAVE_GETHOSTBYNAME_R */ + +/* Define this if gethostbyname_r takes 3 arguments */ +/* #under _EVENT_HAVE_GETHOSTBYNAME_R_3_ARG */ + +/* Define this if gethostbyname_r takes 5 arguments */ +/* #under _EVENT_HAVE_GETHOSTBYNAME_R_5_ARG */ + +/* Define this if gethostbyname_r takes 6 arguments */ +/* #under _EVENT_HAVE_GETHOSTBYNAME_R_6_ARG */ + /* Define to 1 if you have the `getnameinfo' function. */ #define _EVENT_HAVE_GETNAMEINFO 1 +/* Define to 1 if you have the `getprotobynumber' function. */ +#define _EVENT_HAVE_GETPROTOBYNUMBER 1 + +/* Define to 1 if you have the `getservbyname' function. */ +#define _EVENT_HAVE_GETSERVBYNAME 1 + /* Define to 1 if you have the `gettimeofday' function. */ #define _EVENT_HAVE_GETTIMEOFDAY 1 +/* Define to 1 if you have the `inet_aton' function. */ +#define _EVENT_HAVE_INET_ATON 1 + /* Define to 1 if you have the `inet_ntop' function. */ #define _EVENT_HAVE_INET_NTOP 1 +/* Define to 1 if you have the `inet_pton' function. */ +#define _EVENT_HAVE_INET_PTON 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_INTTYPES_H 1 @@ -68,23 +123,29 @@ /* Define to 1 if you have the `kqueue' function. */ #define _EVENT_HAVE_KQUEUE 1 -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef _EVENT_HAVE_LIBNSL */ - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -#define _EVENT_HAVE_LIBRESOLV 1 - -/* Define to 1 if you have the `rt' library (-lrt). */ -/* #undef _EVENT_HAVE_LIBRT */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef _EVENT_HAVE_LIBSOCKET */ +/* Define if the system has zlib */ +#define _EVENT_HAVE_LIBZ 1 /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_MEMORY_H 1 +/* Define to 1 if you have the `mmap' function. */ +#define _EVENT_HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_NETDB_H 1 + /* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_NETINET_IN6_H */ +/* #under _EVENT_HAVE_NETINET_IN6_H */ + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_NETINET_IN_H 1 + +/* Define if the system has openssl */ +#define _EVENT_HAVE_OPENSSL 1 + +/* Define to 1 if you have the `pipe' function. */ +#define _EVENT_HAVE_PIPE 1 /* Define to 1 if you have the `poll' function. */ #define _EVENT_HAVE_POLL 1 @@ -93,14 +154,32 @@ #define _EVENT_HAVE_POLL_H 1 /* Define to 1 if you have the `port_create' function. */ -/* #undef _EVENT_HAVE_PORT_CREATE */ +/* #under _EVENT_HAVE_PORT_CREATE */ /* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_PORT_H */ +/* #under _EVENT_HAVE_PORT_H */ + +/* Define if you have POSIX threads libraries and header files. */ +/* #under _EVENT_HAVE_PTHREAD */ + +/* Define if we have pthreads on this system */ +#define _EVENT_HAVE_PTHREADS 1 + +/* Define to 1 if you have the `putenv' function. */ +#define _EVENT_HAVE_PUTENV 1 + +/* Define to 1 if the system has the type `sa_family_t'. */ +#define _EVENT_HAVE_SA_FAMILY_T 1 /* Define to 1 if you have the `select' function. */ #define _EVENT_HAVE_SELECT 1 +/* Define to 1 if you have the `sendfile' function. */ +#define _EVENT_HAVE_SENDFILE 1 + +/* Define to 1 if you have the `setenv' function. */ +#define _EVENT_HAVE_SETENV 1 + /* Define if F_SETFD is defined in */ #define _EVENT_HAVE_SETFD 1 @@ -110,12 +189,15 @@ /* Define to 1 if you have the `signal' function. */ #define _EVENT_HAVE_SIGNAL 1 -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SIGNAL_H 1 +/* Define to 1 if you have the `splice' function. */ +/* #under _EVENT_HAVE_SPLICE */ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_STDARG_H 1 +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STDDEF_H 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_STDINT_H 1 @@ -140,14 +222,41 @@ /* Define to 1 if you have the `strtoll' function. */ #define _EVENT_HAVE_STRTOLL 1 +/* Define to 1 if the system has the type `struct addrinfo'. */ +#define _EVENT_HAVE_STRUCT_ADDRINFO 1 + /* Define to 1 if the system has the type `struct in6_addr'. */ #define _EVENT_HAVE_STRUCT_IN6_ADDR 1 +/* Define to 1 if `s6_addr16' is a member of `struct in6_addr'. */ +/* #under _EVENT_HAVE_STRUCT_IN6_ADDR_S6_ADDR16 */ + +/* Define to 1 if `s6_addr32' is a member of `struct in6_addr'. */ +/* #under _EVENT_HAVE_STRUCT_IN6_ADDR_S6_ADDR32 */ + +/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +#define _EVENT_HAVE_STRUCT_SOCKADDR_IN6 1 + +/* Define to 1 if `sin6_len' is a member of `struct sockaddr_in6'. */ +#define _EVENT_HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1 + +/* Define to 1 if `sin_len' is a member of `struct sockaddr_in'. */ +#define _EVENT_HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1 + +/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ +#define _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 + +/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */ +/* #under _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */ + /* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ +/* #under _EVENT_HAVE_SYS_DEVPOLL_H */ /* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_SYS_EPOLL_H */ +/* #under _EVENT_HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #under _EVENT_HAVE_SYS_EVENTFD_H */ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_EVENT_H 1 @@ -155,6 +264,9 @@ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_MMAN_H 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_PARAM_H 1 @@ -164,18 +276,30 @@ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_SELECT_H 1 +/* Define to 1 if you have the header file. */ +/* #under _EVENT_HAVE_SYS_SENDFILE_H */ + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_SOCKET_H 1 /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_SYSCTL_H 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_WAIT_H 1 + /* Define if TAILQ_FOREACH is defined in */ #define _EVENT_HAVE_TAILQFOREACH 1 @@ -203,9 +327,15 @@ /* Define to 1 if the system has the type `uint8_t'. */ #define _EVENT_HAVE_UINT8_T 1 +/* Define to 1 if the system has the type `uintptr_t'. */ +#define _EVENT_HAVE_UINTPTR_T 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_UNISTD_H 1 +/* Define to 1 if you have the `unsetenv' function. */ +#define _EVENT_HAVE_UNSETENV 1 + /* Define to 1 if you have the `vasprintf' function. */ #define _EVENT_HAVE_VASPRINTF 1 @@ -217,7 +347,7 @@ #define _EVENT_LT_OBJDIR ".libs/" /* Numeric representation of the version */ -#define _EVENT_NUMERIC_VERSION 0x01040d01 +#define _EVENT_NUMERIC_VERSION 0x02000a00 /* Name of package */ #define _EVENT_PACKAGE "libevent" @@ -234,21 +364,37 @@ /* Define to the one symbol short name of this package. */ #define _EVENT_PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define _EVENT_PACKAGE_URL "" + /* Define to the version of this package. */ #define _EVENT_PACKAGE_VERSION "" +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #under _EVENT_PTHREAD_CREATE_JOINABLE */ + /* The size of `int', as computed by sizeof. */ #define _EVENT_SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#define _EVENT_SIZEOF_LONG 4 +#define _EVENT_SIZEOF_LONG 8 /* The size of `long long', as computed by sizeof. */ #define _EVENT_SIZEOF_LONG_LONG 8 +/* The size of `pthread_t', as computed by sizeof. */ +#define _EVENT_SIZEOF_PTHREAD_T 8 + /* The size of `short', as computed by sizeof. */ #define _EVENT_SIZEOF_SHORT 2 +/* The size of `size_t', as computed by sizeof. */ +#define _EVENT_SIZEOF_SIZE_T 8 + +/* The size of `void *', as computed by sizeof. */ +#define _EVENT_SIZEOF_VOID_P 8 + /* Define to 1 if you have the ANSI C header files. */ #define _EVENT_STDC_HEADERS 1 @@ -256,26 +402,29 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define _EVENT_VERSION "1.4.13-stable-dev" +#define _EVENT_VERSION "2.0.10-stable" /* Define to appropriate substitue if compiler doesnt have __func__ */ -/* #undef _EVENT___func__ */ +/* #under _EVENT___func__ */ /* Define to empty if `const' does not conform to ANSI C. */ -/* #undef _EVENT_const */ +/* #under _EVENT_const */ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef _EVENT___cplusplus -/* #undef _EVENT_inline */ +#ifndef __cplusplus +/* #under _EVENT_inline */ #endif /* Define to `int' if does not define. */ -/* #undef _EVENT_pid_t */ +/* #under _EVENT_pid_t */ /* Define to `unsigned int' if does not define. */ -/* #undef _EVENT_size_t */ +/* #under _EVENT_size_t */ /* Define to unsigned int if you dont have it */ -/* #undef _EVENT_socklen_t */ +/* #under _EVENT_socklen_t */ + +/* Define to `int' if does not define. */ +/* #under _EVENT_ssize_t */ #endif -- 2.40.0