View | Details | Raw Unified | Return to bug 705
Collapse All | Expand All

(-)a/src/contrib/net-anim/animation-interface.cc (-2 / +6 lines)
 Lines 21-29    Link Here 
21
#include <stdio.h>
21
#include <stdio.h>
22
#include <sstream>
22
#include <sstream>
23
23
24
#include "ns3/net-anim-config.h"
25
24
// Socket related includes
26
// Socket related includes
25
#include <sys/socket.h>
27
#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H)
26
#include <netinet/in.h>
28
# include <sys/socket.h>
29
# include <netinet/in.h>
30
#endif
27
31
28
// ns3 includes
32
// ns3 includes
29
#include "ns3/animation-interface.h"
33
#include "ns3/animation-interface.h"
(-)a/src/contrib/net-anim/point-to-point-dumbbell-helper.cc (-2 / +6 lines)
 Lines 21-29    Link Here 
21
#include <iostream>
21
#include <iostream>
22
#include <sstream>
22
#include <sstream>
23
23
24
#include "ns3/net-anim-config.h"
25
24
// Socket related includes
26
// Socket related includes
25
#include <sys/socket.h>
27
#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H)
26
#include <netinet/in.h>
28
# include <sys/socket.h>
29
# include <netinet/in.h>
30
#endif
27
31
28
// ns3 includes
32
// ns3 includes
29
#include "ns3/animation-interface.h"
33
#include "ns3/animation-interface.h"
(-)a/src/contrib/net-anim/wscript (+6 lines)
 Lines 1-5    Link Here 
1
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
1
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
2
2
3
def configure(conf):
4
    conf.check(header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H')
5
    conf.check(header_name='netinet/in.h', define_name='HAVE_NETINET_IN_H')
6
    conf.write_config_header('ns3/net-anim-config.h', top=True)
7
8
3
def build(bld):
9
def build(bld):
4
    obj = bld.create_ns3_module('net-anim')
10
    obj = bld.create_ns3_module('net-anim')
5
    obj.source = [
11
    obj.source = [
(-)a/src/contrib/wscript (-1 / +3 lines)
 Lines 14-22    Link Here 
14
    conf.report_optional_feature("XmlIo", "XmlIo",
14
    conf.report_optional_feature("XmlIo", "XmlIo",
15
                                 conf.env['ENABLE_LIBXML2'],
15
                                 conf.env['ENABLE_LIBXML2'],
16
                                 "library 'libxml-2.0 >= 2.7' not found")
16
                                 "library 'libxml-2.0 >= 2.7' not found")
17
    conf.write_config_header('ns3/contrib-config.h', top=True)
18
17
    conf.sub_config('stats')
19
    conf.sub_config('stats')
20
    conf.sub_config('net-anim')
18
21
19
    conf.write_config_header('ns3/contrib-config.h', top=True)
20
22
21
def build(bld):
23
def build(bld):
22
    module = bld.create_ns3_module('contrib', ['simulator', 'common'])
24
    module = bld.create_ns3_module('contrib', ['simulator', 'common'])

Return to bug 705