Changeset 10590 for branches

Timestamp:

May 1, 2010, 1:00:18 PM (12 years ago)

Author:

livings124

Message:

(1.9x) compile on Mac again; #3104 tr-dht.c: signed port number

Location:

branches/1.9x

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (6 diffs)
• libtransmission/tr-dht.c (modified) (2 diffs)

branches/1.9x/Transmission.xcodeproj/project.pbxproj

@@ -221 +221 @@
                 A2DA362B0CBC674900C2ED41 /* InfoFiles.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DA36280CBC674900C2ED41 /* InfoFiles.png */; };
                 A2DA362C0CBC674900C2ED41 /* InfoPeers.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DA36290CBC674900C2ED41 /* InfoPeers.png */; };
+                A2DDA068118C5CEB009E7F37 /* connecthostport.c in Sources */ = {isa = PBXBuildFile; fileRef = A2DDA067118C5CEB009E7F37 /* connecthostport.c */; };
+                A2DDA06A118C5CF2009E7F37 /* connecthostport.h in Headers */ = {isa = PBXBuildFile; fileRef = A2DDA069118C5CF2009E7F37 /* connecthostport.h */; };
                 A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DF37050C220D03006523C1 /* CreatorWindowController.m */; };
                 A2DF58580DE4B2B0000795D5 /* JSON_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = A2DF576A0DE468C6000795D5 /* JSON_parser.c */; };
@@ -725 +727 @@
                 A2DC1E4B10E6731000DFB18C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = macosx/zh_CN.lproj/MainMenu.xib; sourceTree = "<group>"; };
                 A2DC1E4C10E6731000DFB18C /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = macosx/zh_CN.lproj/PrefsWindow.xib; sourceTree = "<group>"; };
+                A2DDA067118C5CEB009E7F37 /* connecthostport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = connecthostport.c; path = "third-party/miniupnp/connecthostport.c"; sourceTree = "<group>"; };
+                A2DDA069118C5CF2009E7F37 /* connecthostport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connecthostport.h; path = "third-party/miniupnp/connecthostport.h"; sourceTree = "<group>"; };
                 A2DF37040C220D03006523C1 /* CreatorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreatorWindowController.h; path = macosx/CreatorWindowController.h; sourceTree = "<group>"; };
                 A2DF37050C220D03006523C1 /* CreatorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreatorWindowController.m; path = macosx/CreatorWindowController.m; sourceTree = "<group>"; };
@@ -1318 +1322 @@
                         isa = PBXGroup;
                         children = (
+                                A2DDA067118C5CEB009E7F37 /* connecthostport.c */,
                                 BE1183610CE160D50002D0F3 /* igd_desc_parse.c */,
                                 BE1183620CE160D50002D0F3 /* minixml.c */,
@@ -1327 +1332 @@
                                 BE1183680CE160D50002D0F3 /* miniupnpc.c */,
                                 BE11834D0CE160C50002D0F3 /* bsdqueue.h */,
+                                A2DDA069118C5CF2009E7F37 /* connecthostport.h */,
                                 BE11834E0CE160C50002D0F3 /* declspec.h */,
                                 BE11834F0CE160C50002D0F3 /* igd_desc_parse.h */,
@@ -1527 +1533 @@
                                 A254853C0EB66CD4004539DA /* codelength.h in Headers */,
                                 A2F8CD430F3D0F4A00DB356A /* miniupnpcstrings.h in Headers */,
+                                A2DDA06A118C5CF2009E7F37 /* connecthostport.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2053 +2060 @@
                                 BE11836F0CE160D50002D0F3 /* upnpcommands.c in Sources */,
                                 BE1183700CE160D50002D0F3 /* miniupnpc.c in Sources */,
+                                A2DDA068118C5CEB009E7F37 /* connecthostport.c in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

branches/1.9x/libtransmission/tr-dht.c

@@ -102 +102 @@
 
 static void
-bootstrap_from_name( const char *name, short int port, int af )
+bootstrap_from_name( const char *name, tr_port port, int af )
 {
     struct addrinfo hints, *info, *infop;
@@ -112 +112 @@
     hints.ai_family = af;
     /* No, just passing p + 1 to gai won't work. */
-    tr_snprintf(pp, sizeof(pp), "%d", port);
+    tr_snprintf(pp, sizeof(pp), "%d", (int)port);
 
     rc = getaddrinfo(name, pp, &hints, &info);