From 1dc8c470592b5b931da5ad8a9f7f4b5ae24f0574 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 14 Dec 2012 23:28:49 +0000 Subject: [PATCH] mac build compiles with r13667 --- Transmission.xcodeproj/project.pbxproj | 36 ++++++++++++++------------ macosx/Controller.m | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index c9a4f1669..26faaaa9c 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -185,6 +185,11 @@ A25964A6106D73A800453B31 /* announcer.c in Sources */ = {isa = PBXBuildFile; fileRef = A25964A4106D73A800453B31 /* announcer.c */; }; A25964A7106D73A800453B31 /* announcer.h in Headers */ = {isa = PBXBuildFile; fileRef = A25964A5106D73A800453B31 /* announcer.h */; }; A25BB02A12F4F517004B724E /* InfoTabButtonBack.m in Sources */ = {isa = PBXBuildFile; fileRef = A25BB02912F4F517004B724E /* InfoTabButtonBack.m */; }; + A25BFD69167BED3B0039D1AA /* variant-benc.c in Sources */ = {isa = PBXBuildFile; fileRef = A25BFD63167BED3B0039D1AA /* variant-benc.c */; }; + A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */ = {isa = PBXBuildFile; fileRef = A25BFD64167BED3B0039D1AA /* variant-common.h */; }; + A25BFD6B167BED3B0039D1AA /* variant-json.c in Sources */ = {isa = PBXBuildFile; fileRef = A25BFD65167BED3B0039D1AA /* variant-json.c */; }; + A25BFD6D167BED3B0039D1AA /* variant.c in Sources */ = {isa = PBXBuildFile; fileRef = A25BFD67167BED3B0039D1AA /* variant.c */; }; + A25BFD6E167BED3B0039D1AA /* variant.h in Headers */ = {isa = PBXBuildFile; fileRef = A25BFD68167BED3B0039D1AA /* variant.h */; }; A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */ = {isa = PBXBuildFile; fileRef = A25D2CBB0CF4C7190096A262 /* stats.c */; }; A25D2CBE0CF4C73E0096A262 /* stats.h in Headers */ = {isa = PBXBuildFile; fileRef = A25D2CBA0CF4C7190096A262 /* stats.h */; }; A25E03D90E4015100086C225 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -250,8 +255,6 @@ A2A306620AAD24A80049E2AC /* UKMainThreadProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A3065A0AAD24A80049E2AC /* UKMainThreadProxy.m */; }; A2A4E9210DE0F7E9000CE197 /* web.h in Headers */ = {isa = PBXBuildFile; fileRef = A29EBE530DC01FC9006CEE80 /* web.h */; }; A2A4E9220DE0F7EB000CE197 /* web.c in Sources */ = {isa = PBXBuildFile; fileRef = A29EBE520DC01FC9006CEE80 /* web.c */; }; - A2A4E9870DE10399000CE197 /* json.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4E9840DE1038C000CE197 /* json.h */; }; - A2A4E9880DE1039C000CE197 /* json.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4E9830DE1038C000CE197 /* json.c */; }; A2A4EA0E0DE106EB000CE197 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */; }; A2A4EA0F0DE106EE000CE197 /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */; }; A2A6321B0CD9751700E3DA60 /* BadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A6321A0CD9751700E3DA60 /* BadgeView.m */; }; @@ -448,8 +451,6 @@ BEFC1E560C07861A00B0BB3C /* completion.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E1D0C07861A00B0BB3C /* completion.c */; }; BEFC1E570C07861A00B0BB3C /* clients.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E1E0C07861A00B0BB3C /* clients.h */; }; BEFC1E580C07861A00B0BB3C /* clients.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E1F0C07861A00B0BB3C /* clients.c */; }; - BEFC1E5C0C07861A00B0BB3C /* bencode.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1E230C07861A00B0BB3C /* bencode.h */; }; - BEFC1E5D0C07861A00B0BB3C /* bencode.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1E240C07861A00B0BB3C /* bencode.c */; }; D4AF3B2F0C41F7A500D46B6B /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = D4AF3B2D0C41F7A500D46B6B /* list.c */; }; D4AF3B300C41F7A600D46B6B /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = D4AF3B2E0C41F7A500D46B6B /* list.h */; }; E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9760C04D88F00C5426C /* ProgressGradients.m */; }; @@ -808,6 +809,11 @@ A25964A5106D73A800453B31 /* announcer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = announcer.h; path = libtransmission/announcer.h; sourceTree = ""; }; A25BB02812F4F517004B724E /* InfoTabButtonBack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoTabButtonBack.h; path = macosx/InfoTabButtonBack.h; sourceTree = ""; }; A25BB02912F4F517004B724E /* InfoTabButtonBack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoTabButtonBack.m; path = macosx/InfoTabButtonBack.m; sourceTree = ""; }; + A25BFD63167BED3B0039D1AA /* variant-benc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "variant-benc.c"; path = "libtransmission/variant-benc.c"; sourceTree = ""; }; + A25BFD64167BED3B0039D1AA /* variant-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "variant-common.h"; path = "libtransmission/variant-common.h"; sourceTree = ""; }; + A25BFD65167BED3B0039D1AA /* variant-json.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "variant-json.c"; path = "libtransmission/variant-json.c"; sourceTree = ""; }; + A25BFD67167BED3B0039D1AA /* variant.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = variant.c; path = libtransmission/variant.c; sourceTree = ""; }; + A25BFD68167BED3B0039D1AA /* variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variant.h; path = libtransmission/variant.h; sourceTree = ""; }; A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = ""; }; A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = ""; }; A25E03E00E4015380086C225 /* tr-getopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tr-getopt.h"; path = "libtransmission/tr-getopt.h"; sourceTree = ""; }; @@ -952,8 +958,6 @@ A2A306580AAD24A80049E2AC /* UKKQueue.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKKQueue.m; path = macosx/UKKQueue/UKKQueue.m; sourceTree = ""; }; A2A306590AAD24A80049E2AC /* UKMainThreadProxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UKMainThreadProxy.h; path = macosx/UKKQueue/UKMainThreadProxy.h; sourceTree = ""; }; A2A3065A0AAD24A80049E2AC /* UKMainThreadProxy.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKMainThreadProxy.m; path = macosx/UKKQueue/UKMainThreadProxy.m; sourceTree = ""; }; - A2A4E9830DE1038C000CE197 /* json.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = json.c; path = libtransmission/json.c; sourceTree = ""; }; - A2A4E9840DE1038C000CE197 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = libtransmission/json.h; sourceTree = ""; }; A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ConvertUTF.c; path = libtransmission/ConvertUTF.c; sourceTree = ""; }; A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertUTF.h; path = libtransmission/ConvertUTF.h; sourceTree = ""; }; A2A632190CD9751700E3DA60 /* BadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BadgeView.h; path = macosx/BadgeView.h; sourceTree = ""; }; @@ -1174,8 +1178,6 @@ BEFC1E1D0C07861A00B0BB3C /* completion.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = completion.c; path = libtransmission/completion.c; sourceTree = ""; }; BEFC1E1E0C07861A00B0BB3C /* clients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = clients.h; path = libtransmission/clients.h; sourceTree = ""; }; BEFC1E1F0C07861A00B0BB3C /* clients.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = clients.c; path = libtransmission/clients.c; sourceTree = ""; }; - BEFC1E230C07861A00B0BB3C /* bencode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = bencode.h; path = libtransmission/bencode.h; sourceTree = ""; }; - BEFC1E240C07861A00B0BB3C /* bencode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = bencode.c; path = libtransmission/bencode.c; sourceTree = ""; }; D4AF3B2D0C41F7A500D46B6B /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = list.c; path = libtransmission/list.c; sourceTree = ""; }; D4AF3B2E0C41F7A500D46B6B /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = libtransmission/list.h; sourceTree = ""; }; E138A9750C04D88F00C5426C /* ProgressGradients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ProgressGradients.h; path = macosx/ProgressGradients.h; sourceTree = ""; }; @@ -1704,8 +1706,6 @@ BEFC1E1D0C07861A00B0BB3C /* completion.c */, BEFC1E1E0C07861A00B0BB3C /* clients.h */, BEFC1E1F0C07861A00B0BB3C /* clients.c */, - BEFC1E230C07861A00B0BB3C /* bencode.h */, - BEFC1E240C07861A00B0BB3C /* bencode.c */, A25D2CBA0CF4C7190096A262 /* stats.h */, A25D2CBB0CF4C7190096A262 /* stats.c */, A2D22A110D65EED100007D5F /* verify.h */, @@ -1716,10 +1716,13 @@ A29EBE520DC01FC9006CEE80 /* web.c */, A25E03E00E4015380086C225 /* tr-getopt.h */, A25E03E10E4015380086C225 /* tr-getopt.c */, - A2A4E9840DE1038C000CE197 /* json.h */, - A2A4E9830DE1038C000CE197 /* json.c */, A2A7B329164F87D400B98C65 /* jsonsl.h */, A2A7B328164F87D400B98C65 /* jsonsl.c */, + A25BFD63167BED3B0039D1AA /* variant-benc.c */, + A25BFD64167BED3B0039D1AA /* variant-common.h */, + A25BFD65167BED3B0039D1AA /* variant-json.c */, + A25BFD67167BED3B0039D1AA /* variant.c */, + A25BFD68167BED3B0039D1AA /* variant.h */, A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */, A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */, 4DB74F070E8CD75100AEB1A8 /* wildmat.c */, @@ -2030,7 +2033,6 @@ BEFC1E520C07861A00B0BB3C /* fdlimit.h in Headers */, BEFC1E550C07861A00B0BB3C /* completion.h in Headers */, BEFC1E570C07861A00B0BB3C /* clients.h in Headers */, - BEFC1E5C0C07861A00B0BB3C /* bencode.h in Headers */, A2BE9C530C1E4AF7002D16E6 /* makemeta.h in Headers */, D4AF3B300C41F7A600D46B6B /* list.h in Headers */, A24621410C769D0900088E81 /* trevent.h in Headers */, @@ -2046,7 +2048,6 @@ A29DF8BE0DB2545F00D04E5A /* verify.h in Headers */, A2AAB6650DE0D08B00E04DDA /* blocklist.h in Headers */, A2A4E9210DE0F7E9000CE197 /* web.h in Headers */, - A2A4E9870DE10399000CE197 /* json.h in Headers */, A2A4EA0F0DE106EE000CE197 /* ConvertUTF.h in Headers */, A25E03E20E4015380086C225 /* tr-getopt.h in Headers */, A21FBBAB0EDA78C300BC3C51 /* bandwidth.h in Headers */, @@ -2065,6 +2066,8 @@ A2EE726F14DCCC950093C99A /* natpmp_local.h in Headers */, A2D77451154CC25700A62B93 /* WebSeedTableView.h in Headers */, A2A7B32B164F87D400B98C65 /* jsonsl.h in Headers */, + A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */, + A25BFD6E167BED3B0039D1AA /* variant.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2633,7 +2636,6 @@ BEFC1E530C07861A00B0BB3C /* fdlimit.c in Sources */, BEFC1E560C07861A00B0BB3C /* completion.c in Sources */, BEFC1E580C07861A00B0BB3C /* clients.c in Sources */, - BEFC1E5D0C07861A00B0BB3C /* bencode.c in Sources */, A2BE9C520C1E4AF5002D16E6 /* makemeta.c in Sources */, D4AF3B2F0C41F7A500D46B6B /* list.c in Sources */, 4394AC670C74FB6000F367E8 /* ptrarray.c in Sources */, @@ -2649,7 +2651,6 @@ 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */, A29DF8B90DB2544C00D04E5A /* resume.c in Sources */, A2A4E9220DE0F7EB000CE197 /* web.c in Sources */, - A2A4E9880DE1039C000CE197 /* json.c in Sources */, A2A4EA0E0DE106EB000CE197 /* ConvertUTF.c in Sources */, A292A6E80DFB45FC004B9C0A /* webseed.c in Sources */, A25E03E30E4015380086C225 /* tr-getopt.c in Sources */, @@ -2669,6 +2670,9 @@ A2AA9BE1132CAC8E00FA131E /* announcer-udp.c in Sources */, A2D77452154CC25700A62B93 /* WebSeedTableView.m in Sources */, A2A7B32A164F87D400B98C65 /* jsonsl.c in Sources */, + A25BFD69167BED3B0039D1AA /* variant-benc.c in Sources */, + A25BFD6B167BED3B0039D1AA /* variant-json.c in Sources */, + A25BFD6D167BED3B0039D1AA /* variant.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/Controller.m b/macosx/Controller.m index 701084b05..10b26f1c0 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -57,8 +57,8 @@ #import "ExpandedPathToIconTransformer.h" #import "transmission.h" -#import "bencode.h" #import "utils.h" +#import "variant.h" #import "UKKQueue.h" #import