Changeset 13671

Timestamp:

Dec 14, 2012, 11:28:49 PM (8 years ago)

Author:

livings124

Message:

mac build compiles with r13667

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (14 diffs)
• macosx/Controller.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -186 +186 @@
                 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 */; };
@@ -251 +256 @@
                 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 */; };
@@ -449 +452 @@
                 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 */; };
@@ -809 +810 @@
                 A25BB02812F4F517004B724E /* InfoTabButtonBack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoTabButtonBack.h; path = macosx/InfoTabButtonBack.h; sourceTree = "<group>"; };
                 A25BB02912F4F517004B724E /* InfoTabButtonBack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoTabButtonBack.m; path = macosx/InfoTabButtonBack.m; sourceTree = "<group>"; };
+                A25BFD63167BED3B0039D1AA /* variant-benc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "variant-benc.c"; path = "libtransmission/variant-benc.c"; sourceTree = "<group>"; };
+                A25BFD64167BED3B0039D1AA /* variant-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "variant-common.h"; path = "libtransmission/variant-common.h"; sourceTree = "<group>"; };
+                A25BFD65167BED3B0039D1AA /* variant-json.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "variant-json.c"; path = "libtransmission/variant-json.c"; sourceTree = "<group>"; };
+                A25BFD67167BED3B0039D1AA /* variant.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = variant.c; path = libtransmission/variant.c; sourceTree = "<group>"; };
+                A25BFD68167BED3B0039D1AA /* variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variant.h; path = libtransmission/variant.h; sourceTree = "<group>"; };
                 A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = "<group>"; };
                 A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = "<group>"; };
@@ -953 +959 @@
                 A2A306590AAD24A80049E2AC /* UKMainThreadProxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UKMainThreadProxy.h; path = macosx/UKKQueue/UKMainThreadProxy.h; sourceTree = "<group>"; };
                 A2A3065A0AAD24A80049E2AC /* UKMainThreadProxy.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKMainThreadProxy.m; path = macosx/UKKQueue/UKMainThreadProxy.m; sourceTree = "<group>"; };
-                A2A4E9830DE1038C000CE197 /* json.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = json.c; path = libtransmission/json.c; sourceTree = "<group>"; };
-                A2A4E9840DE1038C000CE197 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = libtransmission/json.h; sourceTree = "<group>"; };
                 A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ConvertUTF.c; path = libtransmission/ConvertUTF.c; sourceTree = "<group>"; };
                 A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertUTF.h; path = libtransmission/ConvertUTF.h; sourceTree = "<group>"; };
@@ -1175 +1179 @@
                 BEFC1E1E0C07861A00B0BB3C /* clients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = clients.h; path = libtransmission/clients.h; sourceTree = "<group>"; };
                 BEFC1E1F0C07861A00B0BB3C /* clients.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = clients.c; path = libtransmission/clients.c; sourceTree = "<group>"; };
-                BEFC1E230C07861A00B0BB3C /* bencode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = bencode.h; path = libtransmission/bencode.h; sourceTree = "<group>"; };
-                BEFC1E240C07861A00B0BB3C /* bencode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = bencode.c; path = libtransmission/bencode.c; sourceTree = "<group>"; };
                 D4AF3B2D0C41F7A500D46B6B /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = list.c; path = libtransmission/list.c; sourceTree = "<group>"; };
                 D4AF3B2E0C41F7A500D46B6B /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = libtransmission/list.h; sourceTree = "<group>"; };
@@ -1705 +1707 @@
                                 BEFC1E1E0C07861A00B0BB3C /* clients.h */,
                                 BEFC1E1F0C07861A00B0BB3C /* clients.c */,
-                                BEFC1E230C07861A00B0BB3C /* bencode.h */,
-                                BEFC1E240C07861A00B0BB3C /* bencode.c */,
                                 A25D2CBA0CF4C7190096A262 /* stats.h */,
                                 A25D2CBB0CF4C7190096A262 /* stats.c */,
@@ -1717 +1717 @@
                                 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 */,
@@ -2031 +2034 @@
                                 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 */,
@@ -2047 +2049 @@
                                 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 */,
@@ -2066 +2067 @@
                                 A2D77451154CC25700A62B93 /* WebSeedTableView.h in Headers */,
                                 A2A7B32B164F87D400B98C65 /* jsonsl.h in Headers */,
+                                A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */,
+                                A25BFD6E167BED3B0039D1AA /* variant.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2634 +2637 @@
                                 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 */,
@@ -2650 +2652 @@
                                 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 */,
@@ -2670 +2671 @@
                                 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;

trunk/macosx/Controller.m

@@ -58 +58 @@
 
 #import "transmission.h"
-#import "bencode.h"
 #import "utils.h"
+#import "variant.h"
 
 #import "UKKQueue.h"