~ubuntu-branches/ubuntu/jaunty/curl/jaunty-security

« back to all changes in this revision

Viewing changes to lib/inet_ntop.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-08-01 12:22:30 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070801122230-uaarmp6lo65py9t6
Tags: 7.16.4-1ubuntu1
* Merge with Debian.
  - Drop debian/patches/gnutls-verifications, applied upstream.
  - Remove all stuff which should be reverted according to 7.16.2-6ubuntu4.
  - Remaining change: drop stunnel build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
 
43
43
#include "inet_ntop.h"
44
44
 
 
45
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
 
46
NETINET_DEFINE_CONTEXT
 
47
#endif
 
48
 
45
49
#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
46
50
/* this platform has a inet_ntoa_r() function, but no proto declared anywhere
47
51
   so we include our own proto to make compilers happy */