merge with trunk

This commit is contained in:
Mathieu Lacage
2007-02-22 09:40:46 +01:00
parent 2a994cb96e
commit 2218e346ae
2 changed files with 13 additions and 4 deletions

View File

@@ -18,9 +18,13 @@
*
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
*/
#include "ns3/debug.h"
NS_DEBUG_COMPONENT_DEFINE("Ipv4Address");
#include "ipv4-address.h"
namespace ns3 {
#define ASCII_DOT (0x2e)