← Back to branch summary

~ubuntu-branches/ubuntu/vivid/curl/vivid

« back to all changes in this revision

Viewing changes to lib/hostasyn.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Schuldei
  • Date: 2009-04-02 23:35:45 UTC
  • mfrom: (1.1.12 upstream)
  • mto: (3.3.1 squeeze)
  • mto: This revision was merged to the branch mainline in revision 38.
  • Revision ID: james.westby@ubuntu.com-20090402233545-8xjr3o2sgce5s4bg
Tags: 7.19.4-1
http://bugs.debian.org/517277
* New upstream release
* Fix "newer bdb version" <explain what you changed and why> 
  (Closes: #517277)
* resolve libtool version confusion, thanks to 
  Stefanos Harhalakis <v13@v13.gr>
* add new dependency on libgcrypt11-dev due to newly arising binary symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/hostasyn.c
5
5
 *                            | (__| |_| |  _ <| |___
6
6
 *                             \___|\___/|_| \_\_____|
7
7
 *
8
 
 * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
 
8
 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
9
9
 *
10
10
 * This software is licensed as described in the file COPYING, which
11
11
 * you should have received as part of this distribution. The terms
18
18
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
 * KIND, either express or implied.
20
20
 *
21
 
 * $Id: hostasyn.c,v 1.19 2007-09-28 21:48:28 bagder Exp $
 
21
 * $Id: hostasyn.c,v 1.22 2008-10-30 13:45:25 yangtse Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
52
52
#include <stdlib.h>
53
53
#endif
54
54
 
55
 
#ifdef HAVE_SETJMP_H
56
 
#include <setjmp.h>
57
 
#endif
58
 
 
59
55
#ifdef HAVE_PROCESS_H
60
56
#include <process.h>
61
57
#endif
71
67
#define _MPRINTF_REPLACE /* use our functions only */
72
68
#include <curl/mprintf.h>
73
69
 
74
 
#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
75
 
#include "inet_ntoa_r.h"
76
 
#endif
77
 
 
78
70
#include "memory.h"
79
71
/* The last #include file should be: */
80
72
#include "memdebug.h"
168
160
#ifdef HAVE_CARES_CALLBACK_TIMEOUTS
169
161
                                 int timeouts,
170
162
#endif
171
 
                                 struct addrinfo *ai)
 
163
                                 Curl_addrinfo *ai)
172
164
{
173
165
 /* NOTE: for CURLRES_ARES, the 'ai' argument is really a
174
166
  * 'struct hostent' pointer.