← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/if2ip.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/if2ip.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: if2ip.c,v 1.45 2006-06-08 06:12:31 bagder Exp $
 
21
 * $Id: if2ip.c,v 1.46 2006-08-04 18:53:47 danf Exp $
22
22
 ***************************************************************************/
23
23
 
24
24
#include "setup.h"
33
33
 
34
34
#include "if2ip.h"
35
35
 
 
36
/*
 
37
 * This test can probably be simplified to #if defined(SIOCGIFADDR) and
 
38
 * moved after the following includes.
 
39
 */
36
40
#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
37
41
    !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
38
 
    !defined(_AMIGASF)
 
42
    !defined(_AMIGASF) && !defined(_MINIX)
39
43
 
40
44
#ifdef HAVE_SYS_SOCKET_H
41
45
#include <sys/socket.h>