← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/net-snmp/intrepid-proposed

« back to all changes in this revision

Viewing changes to apps/snmpnetstat/inet6.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2006-11-28 12:29:34 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061128122934-82xxzy2zcvypnvy7
Tags: 5.2.3-4ubuntu1
* Merge from debian unstable, remaining changes:
  - remove stop links from rc0 and rc6

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/snmpnetstat/inet6.c
42
42
 
43
43
#include <net-snmp/net-snmp-config.h>
44
44
 
45
 
/*
46
 
 * hack-o-matic for Cygwin to use winsock2
47
 
*/
48
 
#if defined(cygwin)
49
 
#undef HAVE_UNISTD_H
50
 
#undef HAVE_NETINET_IN_H
51
 
#undef HAVE_ARPA_INET_H
52
 
#undef HAVE_SYS_PARAM_H
53
 
#undef HAVE_SYS_SELECT_H
54
 
#undef HAVE_SYS_SOCKET_H
55
 
#undef HAVE_IN_ADDR_T
 
45
#if HAVE_UNISTD_H
 
46
#include <unistd.h>
56
47
#endif
57
 
 
58
 
#if defined(HAVE_WINSOCK_H) || defined(cygwin)
 
48
#if HAVE_WINSOCK_H
59
49
#include <winsock2.h>
60
50
#include <ws2tcpip.h>
61
51
#include "winstub.h"
62
 
 
63
 
extern const char *inet_ntop(int, const void*, char*, size_t);
64
 
 
65
 
#ifdef cygwin
66
 
extern int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, char*,DWORD,int);
67
 
#endif
68
 
 
69
 
#else                  /* WIN32 */
 
52
#endif
 
53
#if HAVE_SYS_SOCKET_H
 
54
#include <sys/socket.h>
 
55
#endif
70
56
#if HAVE_NETDB_H
71
57
#include <netdb.h>
72
58
#endif
73
 
#endif                  /* WIN32 */
 
59
#if HAVE_SYS_TYPES_H
 
60
#include <sys/types.h>
 
61
#endif
 
62
 
 
63
#if HAVE_NETINET_IN_H
 
64
#include <netinet/in.h>
 
65
#endif
 
66
#if HAVE_ARPA_INET_H
 
67
#include <arpa/inet.h>
 
68
#endif
74
69
 
75
70
#include <net-snmp/net-snmp-includes.h>
76
71
 
77
 
#if HAVE_UNISTD_H
78
 
#include <unistd.h>
79
 
#endif
80
 
 
81
72
#include "main.h"
82
73
#include "netstat.h"
83
74