← Back to branch summary

~ubuntu-branches/ubuntu/hardy/curl/hardy-updates

« back to all changes in this revision

Viewing changes to lib/hostasyn.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-10-30 10:56:48 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061030105648-uo8q8w9xklb40b4k
Tags: 7.15.5-1ubuntu1
* Merge from debian unstable. Remaining Ubuntu changes:
  - debian/control: Drop libdb4.2 build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/hostasyn.c
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.13 2006-05-04 22:39:47 bagder Exp $
 
21
 * $Id: hostasyn.c,v 1.16 2006-07-25 13:49:50 yangtse Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
25
25
 
26
26
#include <string.h>
27
27
 
28
 
#ifdef HAVE_MALLOC_H  /* Win32 */
 
28
#ifdef NEED_MALLOC_H
29
29
#include <malloc.h>
30
30
#endif
31
31
#ifdef HAVE_SYS_TYPES_H
112
112
  if(CURL_ASYNC_SUCCESS == status) {
113
113
 
114
114
    /*
115
 
     * IPv4: Curl_addrinfo_copy() copies the address and returns an allocated
116
 
     * version.
 
115
     * IPv4/ares: Curl_addrinfo_copy() copies the address and returns an
 
116
     * allocated version.
117
117
     *
118
118
     * IPv6: Curl_addrinfo_copy() returns the input pointer!
119
119
     */
164
164
                                 int status,
165
165
                                 struct addrinfo *ai)
166
166
{
 
167
 /* NOTE: for CURLRES_ARES, the 'ai' argument is really a
 
168
  * 'struct hostent' pointer.
 
169
  */
167
170
  return addrinfo_callback(arg, status, ai);
168
171
}
169
172
#endif