--- a/src/devices/wifi/dcf-manager.cc	Thu Nov 29 15:50:15 2007 +0100
+++ b/src/devices/wifi/dcf-manager.cc	Thu Nov 29 15:59:31 2007 +0100
@@ -372,7 +372,7 @@
    * if there is one, how many slots for AIFS+backoff does it require ?
    */
   bool accessTimeoutNeeded = false;
-  Time expectedBackoffEnd = MaxSeconds ();
+  Time expectedBackoffEnd = Simulator::GetMaximumSimulationTime ();
   for (States::const_iterator i = m_states.begin (); i != m_states.end (); i++)
     {
       DcfState *state = *i;

--- a/src/simulator/nstime.h	Thu Nov 29 15:50:15 2007 +0100
+++ b/src/simulator/nstime.h	Thu Nov 29 15:59:31 2007 +0100
@@ -577,12 +577,6 @@
  */
 Time FemtoSeconds (uint64_t fs);
 
-/**
- * \brief create a ns3::Time instance which represents
- * the maximum value representable in a simulation.
- */
-Time MaxSeconds (void);
-
 // internal function not publicly documented
 Time TimeStep (uint64_t ts);
 

--- a/src/simulator/time.cc	Thu Nov 29 15:50:15 2007 +0100
+++ b/src/simulator/time.cc	Thu Nov 29 15:59:31 2007 +0100
@@ -268,13 +268,6 @@
   uint64_t ts = TimeUnit<1>::UnitsToTimestep(fs, TimeStepPrecision::FS_FACTOR);
   return TimeStep(ts);
 }
-Time MaxSeconds (void)
-{
-  // XXX: I am fairly certain other compilers use other non-standard
-  // post-fixes to indicate 64 bit constants.
-  return TimeStep (0x7fffffffffffffffLL);
-}
-
 /*
  * The timestep value passed to this function must be of the precision
  * of TimeStepPrecision::Get