emane/emane-ace-headers.patch

   1 diff -Naur emane-0.6.4/agents/gpsdlocation/gpsdlocationagent.cc emane-0.6.4-patched/agents/gpsdlocation/gpsdlocationagent.cc
   2 --- emane-0.6.4/agents/gpsdlocation/gpsdlocationagent.cc        2010-09-22 09:38:02.000000000 -0400
   3 +++ emane-0.6.4-patched/agents/gpsdlocation/gpsdlocationagent.cc        2011-03-03 13:08:30.013086717 -0500
   4 @@ -36,10 +36,11 @@
   5  #include "emaneutils/parameterconvert.h"
   6  #include <sstream>
   7
   8 -#include <ace/LSOCK_Connector.h>
   9 -#include <ace/SOCK_Connector.h>
  10  #include <ace/DEV_Connector.h>
  11  #include <ace/FILE_Connector.h>
  12 +#include <ace/LSOCK_Connector.h>
  13 +#include <ace/OS_NS_time.h>
  14 +#include <ace/SOCK_Connector.h>
  15  #include <ace/TTY_IO.h>
  16
  17  #ifdef __APPLE__
  18 @@ -213,7 +214,7 @@
  19      }
  20
  21    ACE_TTY_IO slaveTTY;
  22 -  ACE_DEV_CONNECTOR devConnector;
  23 +  ACE_DEV_Connector devConnector;
  24    ACE_TTY_IO::Serial_Params serial_params;
  25
  26    if(devConnector.connect(slaveTTY,ACE_DEV_Addr(&pzName[1])) == -1)
  27 diff -Naur emane-0.6.4/configure.ac emane-0.6.4-patched/configure.ac
  28 --- emane-0.6.4/configure.ac    2010-09-22 09:38:06.000000000 -0400
  29 +++ emane-0.6.4-patched/configure.ac    2011-03-03 13:08:30.016420740 -0500
  30 @@ -78,7 +78,7 @@
  31     LDFLAGS="${ACE_LIBS} ${LDFLAGS}"
  32  fi
  33
  34 -AC_CHECK_HEADER(ace/OS.h,
  35 +AC_CHECK_HEADER(ace/ACE.h,
  36   [AC_CHECK_LIB([ACE],main,[ACE_LIBS+=' -lACE'],[AC_MSG_ERROR("ACE not installed")])],
  37   [AC_MSG_ERROR("Missing ACE development headers")])
  38
  39 diff -Naur emane-0.6.4/generators/emulationscript/emulationscripteventgenerator.cc emane-0.6.4-patched/generators/emulationscript/emulationscripteventgenerator.cc
  40 --- emane-0.6.4/generators/emulationscript/emulationscripteventgenerator.cc     2010-09-22 09:38:05.000000000 -0400
  41 +++ emane-0.6.4-patched/generators/emulationscript/emulationscripteventgenerator.cc     2011-03-03 13:08:30.006418671 -0500
  42 @@ -39,8 +39,6 @@
  43
  44  #include <sstream>
  45
  46 -#include <ace/OS.h>
  47 -
  48  namespace
  49  {
  50    /* ConfigurationDefinition to be filled-in here */
  51 diff -Naur emane-0.6.4/generators/mitremobility/mobilitymodeleventgenerator.cc emane-0.6.4-patched/generators/mitremobility/mobilitymodeleventgenerator.cc
  52 --- emane-0.6.4/generators/mitremobility/mobilitymodeleventgenerator.cc 2010-09-22 09:38:05.000000000 -0400
  53 +++ emane-0.6.4-patched/generators/mitremobility/mobilitymodeleventgenerator.cc 2011-03-03 13:08:30.009752694 -0500
  54 @@ -38,8 +38,6 @@
  55
  56  #include <sstream>
  57
  58 -#include <ace/OS.h>
  59 -
  60  namespace
  61  {
  62    EMANE::ConfigurationDefinition defs[] =
  63 diff -Naur emane-0.6.4/generators/mitremobility/mobilitymodelloader.cc emane-0.6.4-patched/generators/mitremobility/mobilitymodelloader.cc
  64 --- emane-0.6.4/generators/mitremobility/mobilitymodelloader.cc 2010-09-22 09:38:05.000000000 -0400
  65 +++ emane-0.6.4-patched/generators/mitremobility/mobilitymodelloader.cc 2011-03-03 13:08:30.013086717 -0500
  66 @@ -34,7 +34,7 @@
  67  #include "mobilitymodelloader.h"
  68  #include "emaneutils/spawnmemberfunc.h"
  69
  70 -#include <ace/OS.h>
  71 +#include <cmath>
  72
  73  #define NEM_TO_INDEX(x) ((x) - 1)
  74
  75 diff -Naur emane-0.6.4/include/emaneevents/locationevent.h emane-0.6.4-patched/include/emaneevents/locationevent.h
  76 --- emane-0.6.4/include/emaneevents/locationevent.h     2010-09-22 09:38:06.000000000 -0400
  77 +++ emane-0.6.4-patched/include/emaneevents/locationevent.h     2011-03-03 13:08:29.956408321 -0500
  78 @@ -37,7 +37,6 @@
  79  #include "emane/emaneevent.h"
  80  #include "emaneevents/events.h"
  81
  82 -#include <ace/OS.h>
  83  #include <ace/Basic_Types.h>
  84
  85  /**
  86 diff -Naur emane-0.6.4/include/emaneutils/bitpool.inl emane-0.6.4-patched/include/emaneutils/bitpool.inl
  87 --- emane-0.6.4/include/emaneutils/bitpool.inl  2010-09-22 09:38:06.000000000 -0400
  88 +++ emane-0.6.4-patched/include/emaneutils/bitpool.inl  2011-03-03 13:08:29.959742344 -0500
  89 @@ -33,6 +33,8 @@
  90
  91  #include "bitpool.h"
  92
  93 +#include <cmath>
  94 +
  95  const ACE_UINT64 USEC_PER_SEC = 1000000;
  96
  97
  98 diff -Naur emane-0.6.4/include/emaneutils/netutils.h emane-0.6.4-patched/include/emaneutils/netutils.h
  99 --- emane-0.6.4/include/emaneutils/netutils.h   2010-09-22 09:38:06.000000000 -0400
 100 +++ emane-0.6.4-patched/include/emaneutils/netutils.h   2011-03-03 13:08:29.959742344 -0500
 101 @@ -34,7 +34,6 @@
 102  #ifndef EMANEUTILSNETUTILS_HEADER_
 103  #define EMANEUTILSNETUTILS_HEADER_
 104
 105 -#include <ace/OS.h>
 106  #include <ace/INET_Addr.h>
 107
 108  namespace EMANEUtils
 109 diff -Naur emane-0.6.4/include/emaneutils/recvcancelable.h emane-0.6.4-patched/include/emaneutils/recvcancelable.h
 110 --- emane-0.6.4/include/emaneutils/recvcancelable.h     2010-09-22 09:38:06.000000000 -0400
 111 +++ emane-0.6.4-patched/include/emaneutils/recvcancelable.h     2011-03-03 13:08:29.959742344 -0500
 112 @@ -34,7 +34,7 @@
 113  #ifndef EMANEUTILSRECVCANCELABLE_HEADER_
 114  #define EMANEUTILSRECVCANCELABLE_HEADER_
 115
 116 -#include <ace/OS.h>
 117 +#include <ace/Addr.h>
 118
 119  namespace EMANEUtils
 120  {
 121 diff -Naur emane-0.6.4/libs/emanelogservice/logservice.cc emane-0.6.4-patched/libs/emanelogservice/logservice.cc
 122 --- emane-0.6.4/libs/emanelogservice/logservice.cc      2010-09-22 09:38:06.000000000 -0400
 123 +++ emane-0.6.4-patched/libs/emanelogservice/logservice.cc      2011-03-03 13:08:29.946406252 -0500
 124 @@ -41,7 +41,7 @@
 125  #include <cstdarg>
 126  #include <cstdio>
 127
 128 -#include <ace/OS.h>
 129 +#include <ace/OS_NS_time.h>
 130  #include <ace/Log_Msg.h>
 131  #include <ace/streams.h>
 132
 133 @@ -198,7 +198,7 @@
 134
 135  void EMANE::LogService::redirectLogsToRemoteLogger(const ACE_TCHAR *program, const char* addr)
 136  {
 137 -  if(ACE_LOG_MSG->open(program, ACE_Log_Msg::LOGGER,ACE_LIB_TEXT (addr)) == -1)
 138 +  if(ACE_LOG_MSG->open(program, ACE_Log_Msg::LOGGER,ACE_TEXT (addr)) == -1)
 139    {
 140      ACE_DEBUG((LM_ERROR, ACE_TEXT ("RemoteLogging Failed: %s\n"),ACE_OS::strerror(errno)));
 141    }
 142 diff -Naur emane-0.6.4/libs/emanexmlparser/layerconfiguration.h emane-0.6.4-patched/libs/emanexmlparser/layerconfiguration.h
 143 --- emane-0.6.4/libs/emanexmlparser/layerconfiguration.h        2010-09-22 09:38:06.000000000 -0400
 144 +++ emane-0.6.4-patched/libs/emanexmlparser/layerconfiguration.h        2011-03-03 13:08:29.943072229 -0500
 145 @@ -42,7 +42,7 @@
 146  #include <string>
 147  #include <map>
 148
 149 -#include <ace/OS.h>
 150 +#include <ace/Basic_Types.h>
 151
 152  #include <libxml/tree.h>
 153
 154 diff -Naur emane-0.6.4/libs/emanexmlparser/nemconfiguration.h emane-0.6.4-patched/libs/emanexmlparser/nemconfiguration.h
 155 --- emane-0.6.4/libs/emanexmlparser/nemconfiguration.h  2010-09-22 09:38:06.000000000 -0400
 156 +++ emane-0.6.4-patched/libs/emanexmlparser/nemconfiguration.h  2011-03-03 13:08:29.943072229 -0500
 157 @@ -40,7 +40,7 @@
 158  #include <string>
 159  #include <list>
 160
 161 -#include <ace/OS.h>
 162 +#include <ace/Basic_Types.h>
 163
 164  namespace EMANE
 165  {
 166 diff -Naur emane-0.6.4/libs/emanexmlparser/platformconfiguration.cc emane-0.6.4-patched/libs/emanexmlparser/platformconfiguration.cc
 167 --- emane-0.6.4/libs/emanexmlparser/platformconfiguration.cc    2010-09-22 09:38:06.000000000 -0400
 168 +++ emane-0.6.4-patched/libs/emanexmlparser/platformconfiguration.cc    2011-03-03 13:08:29.943072229 -0500
 169 @@ -36,8 +36,6 @@
 170  #include <iostream>
 171  #include <sstream>
 172
 173 -#include <ace/OS.h>
 174 -
 175  #include <libxml/tree.h>
 176
 177  EMANE::PlatformConfiguration::PlatformConfiguration(EMANE::ConfigurationParser *pParser,
 178 diff -Naur emane-0.6.4/libs/emanexmlparser/platformconfiguration.h emane-0.6.4-patched/libs/emanexmlparser/platformconfiguration.h
 179 --- emane-0.6.4/libs/emanexmlparser/platformconfiguration.h     2010-09-22 09:38:06.000000000 -0400
 180 +++ emane-0.6.4-patched/libs/emanexmlparser/platformconfiguration.h     2011-03-03 13:08:29.943072229 -0500
 181 @@ -41,7 +41,7 @@
 182  #include <string>
 183  #include <list>
 184
 185 -#include <ace/OS.h>
 186 +#include <ace/Basic_Types.h>
 187
 188  namespace EMANE
 189  {
 190 diff -Naur emane-0.6.4/models/ieee80211abg/maclayer/modetimingparameters.cc emane-0.6.4-patched/models/ieee80211abg/maclayer/modetimingparameters.cc
 191 --- emane-0.6.4/models/ieee80211abg/maclayer/modetimingparameters.cc    2010-09-22 09:38:05.000000000 -0400
 192 +++ emane-0.6.4-patched/models/ieee80211abg/maclayer/modetimingparameters.cc    2011-03-03 13:08:29.973078439 -0500
 193 @@ -40,7 +40,6 @@
 194  #include "ieee80211abgphysotmessage.h"
 195  #include "ieee80211abgmaclayer.h"
 196
 197 -#include <ace/OS.h>
 198  #include <ace/Task.h>
 199
 200  #include <math.h>
 201 diff -Naur emane-0.6.4/models/ieee80211abg/maclayer/modetimingparameters.h emane-0.6.4-patched/models/ieee80211abg/maclayer/modetimingparameters.h
 202 --- emane-0.6.4/models/ieee80211abg/maclayer/modetimingparameters.h     2010-09-22 09:38:05.000000000 -0400
 203 +++ emane-0.6.4-patched/models/ieee80211abg/maclayer/modetimingparameters.h     2011-03-03 13:08:29.976412462 -0500
 204 @@ -36,7 +36,6 @@
 205
 206  #include "macconfig.h"
 207
 208 -#include <ace/OS.h>
 209  #include <ace/Basic_Types.h>
 210  #include <ace/Time_Value.h>
 211  #include <ace/Singleton.h>
 212 diff -Naur emane-0.6.4/models/ieee80211abg/maclayer/transmissiontxstate.cc emane-0.6.4-patched/models/ieee80211abg/maclayer/transmissiontxstate.cc
 213 --- emane-0.6.4/models/ieee80211abg/maclayer/transmissiontxstate.cc     2010-09-22 09:38:05.000000000 -0400
 214 +++ emane-0.6.4-patched/models/ieee80211abg/maclayer/transmissiontxstate.cc     2011-03-03 13:08:29.973078439 -0500
 215 @@ -35,8 +35,6 @@
 216  #include "ieee80211abgmaclayer.h"
 217  #include "macstatistics.h"
 218
 219 -#include <ace/OS.h>
 220 -
 221  TransmissionTxState::TransmissionTxState(){}
 222
 223  TransmissionTxState::~TransmissionTxState(){}
 224 diff -Naur emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgbiterrorrate.cc emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgbiterrorrate.cc
 225 --- emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgbiterrorrate.cc        2010-09-22 09:38:06.000000000 -0400
 226 +++ emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgbiterrorrate.cc        2011-03-03 13:08:29.996416600 -0500
 227 @@ -39,8 +39,6 @@
 228  #include <utility>
 229  #include <sstream>
 230
 231 -#include <ace/OS.h>
 232 -
 233  #include <libxml/parser.h>
 234  #include <libxml/tree.h>
 235  #include <libxml/xpath.h>
 236 diff -Naur emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgnoiseestimation.cc emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgnoiseestimation.cc
 237 --- emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgnoiseestimation.cc     2010-09-22 09:38:06.000000000 -0400
 238 +++ emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgnoiseestimation.cc     2011-03-03 13:08:29.999750624 -0500
 239 @@ -37,7 +37,7 @@
 240  #include <math.h>
 241  #include <sstream>
 242
 243 -#include <ace/OS.h>
 244 +#include <ace/OS_NS_time.h>
 245
 246  namespace
 247  {
 248 diff -Naur emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgphylayer.cc emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgphylayer.cc
 249 --- emane-0.6.4/models/ieee80211abg/phylayer/ieee80211abgphylayer.cc    2010-09-22 09:38:06.000000000 -0400
 250 +++ emane-0.6.4-patched/models/ieee80211abg/phylayer/ieee80211abgphylayer.cc    2011-03-03 13:08:29.999750624 -0500
 251 @@ -51,7 +51,7 @@
 252  #include <sstream>
 253
 254  #include <ace/Time_Value.h>
 255 -#include <ace/OS.h>
 256 +#include <ace/OS_NS_time.h>
 257
 258  #define USEC_PER_SEC 1000000
 259
 260 diff -Naur emane-0.6.4/models/ieee80211abg/phylayer/rxbusystate.cc emane-0.6.4-patched/models/ieee80211abg/phylayer/rxbusystate.cc
 261 --- emane-0.6.4/models/ieee80211abg/phylayer/rxbusystate.cc     2010-09-22 09:38:06.000000000 -0400
 262 +++ emane-0.6.4-patched/models/ieee80211abg/phylayer/rxbusystate.cc     2011-03-03 13:08:29.999750624 -0500
 263 @@ -35,7 +35,7 @@
 264  #include "idlestate.h"
 265  #include "ieee80211abgphylayer.h"
 266
 267 -#include <ace/OS.h>
 268 +#include <ace/OS_NS_time.h>
 269
 270  RxBusyState::RxBusyState()
 271  {
 272 diff -Naur emane-0.6.4/models/ieee80211abg/phylayer/rxpendingstate.cc emane-0.6.4-patched/models/ieee80211abg/phylayer/rxpendingstate.cc
 273 --- emane-0.6.4/models/ieee80211abg/phylayer/rxpendingstate.cc  2010-09-22 09:38:06.000000000 -0400
 274 +++ emane-0.6.4-patched/models/ieee80211abg/phylayer/rxpendingstate.cc  2011-03-03 13:08:29.999750624 -0500
 275 @@ -35,7 +35,7 @@
 276  #include "rxbusystate.h"
 277  #include "ieee80211abgphylayer.h"
 278
 279 -#include <ace/OS.h>
 280 +#include <ace/OS_NS_time.h>
 281
 282  RxPendingState::RxPendingState()
 283  {
 284 diff -Naur emane-0.6.4/models/rfpipe/phylayer/rfpipephylayer.cc emane-0.6.4-patched/models/rfpipe/phylayer/rfpipephylayer.cc
 285 --- emane-0.6.4/models/rfpipe/phylayer/rfpipephylayer.cc        2010-09-22 09:38:05.000000000 -0400
 286 +++ emane-0.6.4-patched/models/rfpipe/phylayer/rfpipephylayer.cc        2011-03-03 13:08:29.959742344 -0500
 287 @@ -51,6 +51,9 @@
 288  #include <sstream>
 289  #include <iomanip>
 290
 291 +#include <ace/OS_NS_time.h>
 292 +#include <ace/OS_NS_sys_select.h>
 293 +
 294  namespace
 295  {
 296    EMANE::ConfigurationDefinition defs[] =
 297 diff -Naur emane-0.6.4/services/eventserver/emaneeventserver.cc emane-0.6.4-patched/services/eventserver/emaneeventserver.cc
 298 --- emane-0.6.4/services/eventserver/emaneeventserver.cc        2010-09-22 09:38:03.000000000 -0400
 299 +++ emane-0.6.4-patched/services/eventserver/emaneeventserver.cc        2011-03-03 13:08:29.953074298 -0500
 300 @@ -46,8 +46,8 @@
 301  #include <sstream>
 302  #include <iostream>
 303
 304 -#include <ace/OS.h>
 305  #include <ace/Get_Opt.h>
 306 +#include <ace/OS_NS_time.h>
 307  #include <ace/Reactor.h>
 308  #include <ace/Sched_Params.h>
 309
 310 diff -Naur emane-0.6.4/services/eventserver/eventgeneratorconfiguration.h emane-0.6.4-patched/services/eventserver/eventgeneratorconfiguration.h
 311 --- emane-0.6.4/services/eventserver/eventgeneratorconfiguration.h      2010-09-22 09:38:03.000000000 -0400
 312 +++ emane-0.6.4-patched/services/eventserver/eventgeneratorconfiguration.h      2011-03-03 13:08:29.956408321 -0500
 313 @@ -40,8 +40,6 @@
 314
 315  #include <string>
 316
 317 -#include <ace/OS.h>
 318 -
 319  namespace EMANE
 320  {
 321    /**
 322 diff -Naur emane-0.6.4/services/eventserver/eventgeneratorfactory.h emane-0.6.4-patched/services/eventserver/eventgeneratorfactory.h
 323 --- emane-0.6.4/services/eventserver/eventgeneratorfactory.h    2010-09-22 09:38:03.000000000 -0400
 324 +++ emane-0.6.4-patched/services/eventserver/eventgeneratorfactory.h    2011-03-03 13:08:29.953074298 -0500
 325 @@ -39,7 +39,7 @@
 326  #include "emaneutils/factoryexception.h"
 327  #include "emaneutils/componenttypes.h"
 328
 329 -#include <ace/OS.h>
 330 +#include <ace/OS_NS_dlfcn.h>
 331
 332  namespace EMANE
 333  {
 334 diff -Naur emane-0.6.4/services/eventserver/eventserviceconfiguration.cc emane-0.6.4-patched/services/eventserver/eventserviceconfiguration.cc
 335 --- emane-0.6.4/services/eventserver/eventserviceconfiguration.cc       2010-09-22 09:38:03.000000000 -0400
 336 +++ emane-0.6.4-patched/services/eventserver/eventserviceconfiguration.cc       2011-03-03 13:08:29.956408321 -0500
 337 @@ -43,9 +43,6 @@
 338  #include <sstream>
 339  #include <iostream>
 340
 341 -#include <ace/OS.h>
 342 -
 343 -
 344  EMANE::EventServiceConfiguration::EventServiceConfiguration(const std::string &sFile)
 345    throw(ParseException,ValidateException)
 346    : LayerConfiguration(EMANE::ConfigurationParserSingleton::instance())
 347 diff -Naur emane-0.6.4/shims/timinganalysis/src/timinganalysisshim.cc emane-0.6.4-patched/shims/timinganalysis/src/timinganalysisshim.cc
 348 --- emane-0.6.4/shims/timinganalysis/src/timinganalysisshim.cc  2010-09-22 09:38:03.000000000 -0400
 349 +++ emane-0.6.4-patched/shims/timinganalysis/src/timinganalysisshim.cc  2011-03-03 13:08:30.033090858 -0500
 350 @@ -37,7 +37,7 @@
 351
 352  #include <sstream>
 353
 354 -#include <ace/OS.h>
 355 +#include <ace/OS_NS_time.h>
 356
 357  namespace
 358  {
 359 diff -Naur emane-0.6.4/src/emaneeventd/eventagentconfiguration.h emane-0.6.4-patched/src/emaneeventd/eventagentconfiguration.h
 360 --- emane-0.6.4/src/emaneeventd/eventagentconfiguration.h       2010-09-22 09:38:03.000000000 -0400
 361 +++ emane-0.6.4-patched/src/emaneeventd/eventagentconfiguration.h       2011-03-03 13:08:30.029756834 -0500
 362 @@ -41,8 +41,6 @@
 363  #include <string>
 364  #include <list>
 365
 366 -#include <ace/OS.h>
 367 -
 368  namespace EMANE
 369  {
 370    /**
 371 diff -Naur emane-0.6.4/src/emaneeventd/eventagentfactory.h emane-0.6.4-patched/src/emaneeventd/eventagentfactory.h
 372 --- emane-0.6.4/src/emaneeventd/eventagentfactory.h     2010-09-22 09:38:03.000000000 -0400
 373 +++ emane-0.6.4-patched/src/emaneeventd/eventagentfactory.h     2011-03-03 13:08:30.033090858 -0500
 374 @@ -38,7 +38,7 @@
 375
 376  #include "emaneutils/factoryexception.h"
 377
 378 -#include <ace/OS.h>
 379 +#include <ace/OS_NS_dlfcn.h>
 380
 381  namespace EMANE
 382  {
 383 diff -Naur emane-0.6.4/src/emaneeventd/eventdaemonconfiguration.cc emane-0.6.4-patched/src/emaneeventd/eventdaemonconfiguration.cc
 384 --- emane-0.6.4/src/emaneeventd/eventdaemonconfiguration.cc     2010-09-22 09:38:03.000000000 -0400
 385 +++ emane-0.6.4-patched/src/emaneeventd/eventdaemonconfiguration.cc     2011-03-03 13:08:30.029756834 -0500
 386 @@ -39,7 +39,6 @@
 387  #include "configurationparser.h"
 388  #include "logservice.h"
 389
 390 -#include <ace/OS.h>
 391  #include <utility>
 392
 393  EMANE::EventDaemonConfiguration::EventDaemonConfiguration(const std::string &sFile)
 394 diff -Naur emane-0.6.4/src/emanetransportd/transportdaemonconfiguration.cc emane-0.6.4-patched/src/emanetransportd/transportdaemonconfiguration.cc
 395 --- emane-0.6.4/src/emanetransportd/transportdaemonconfiguration.cc     2010-09-22 09:38:03.000000000 -0400
 396 +++ emane-0.6.4-patched/src/emanetransportd/transportdaemonconfiguration.cc     2011-03-03 13:08:30.023088786 -0500
 397 @@ -39,8 +39,6 @@
 398
 399  #include "logservice.h"
 400
 401 -#include <ace/OS.h>
 402 -
 403  /*
 404   * Constructor
 405   */
 406 diff -Naur emane-0.6.4/src/emanetransportd/transportfactory.h emane-0.6.4-patched/src/emanetransportd/transportfactory.h
 407 --- emane-0.6.4/src/emanetransportd/transportfactory.h  2010-09-22 09:38:03.000000000 -0400
 408 +++ emane-0.6.4-patched/src/emanetransportd/transportfactory.h  2011-03-03 13:08:30.019754763 -0500
 409 @@ -38,7 +38,7 @@
 410
 411  #include "emaneutils/factoryexception.h"
 412
 413 -#include <ace/OS.h>
 414 +#include <ace/OS_NS_dlfcn.h>
 415
 416  namespace EMANE
 417  {
 418 diff -Naur emane-0.6.4/src/emanetransportd/transportinstanceconfiguration.h emane-0.6.4-patched/src/emanetransportd/transportinstanceconfiguration.h
 419 --- emane-0.6.4/src/emanetransportd/transportinstanceconfiguration.h    2010-09-22 09:38:03.000000000 -0400
 420 +++ emane-0.6.4-patched/src/emanetransportd/transportinstanceconfiguration.h    2011-03-03 13:08:30.019754763 -0500
 421 @@ -41,8 +41,6 @@
 422  #include <string>
 423  #include <list>
 424
 425 -#include <ace/OS.h>
 426 -
 427  namespace EMANE
 428  {
 429    /**
 430 diff -Naur emane-0.6.4/src/layerfactory.h emane-0.6.4-patched/src/layerfactory.h
 431 --- emane-0.6.4/src/layerfactory.h      2010-09-22 09:38:03.000000000 -0400
 432 +++ emane-0.6.4-patched/src/layerfactory.h      2011-03-03 13:08:30.026422810 -0500
 433 @@ -37,7 +37,7 @@
 434  #include "emaneutils/factoryexception.h"
 435  #include "emaneutils/componenttypes.h"
 436
 437 -#include <ace/OS.h>
 438 +#include <ace/OS_NS_dlfcn.h>
 439
 440  namespace EMANE
 441  {
 442 diff -Naur emane-0.6.4/transports/raw/rawtransport.cc emane-0.6.4-patched/transports/raw/rawtransport.cc
 443 --- emane-0.6.4/transports/raw/rawtransport.cc  2010-09-22 09:38:02.000000000 -0400
 444 +++ emane-0.6.4-patched/transports/raw/rawtransport.cc  2011-03-03 13:08:29.933070160 -0500
 445 @@ -31,8 +31,6 @@
 446   *
 447   */
 448
 449 -#include <ace/OS.h>
 450 -
 451  #ifdef WIN32
 452  #include <winsock2.h>
 453  #include <iphlpapi.h>
 454 diff -Naur emane-0.6.4/transports/virtual/tuntap.cc emane-0.6.4-patched/transports/virtual/tuntap.cc
 455 --- emane-0.6.4/transports/virtual/tuntap.cc    2010-09-22 09:38:02.000000000 -0400
 456 +++ emane-0.6.4-patched/transports/virtual/tuntap.cc    2011-03-03 13:08:29.939738206 -0500
 457 @@ -34,7 +34,6 @@
 458  #include <ace/SOCK_Dgram.h>
 459  #include <ace/Handle_Set.h>
 460  #include <ace/INET_Addr.h>
 461 -#include <ace/OS.h>
 462
 463
 464  #include "tuntap.h"