--- a/src/core/model/object-base.h	Fri May 13 14:51:51 2011 -0400
+++ b/src/core/model/object-base.h	Fri May 13 14:52:27 2011 -0400
@@ -29,13 +29,13 @@
  * defines a new GetTypeId method.
  */
 #define NS_OBJECT_ENSURE_REGISTERED(type)       \
-  static struct X##type##RegistrationClass      \
+  static struct X## type ## RegistrationClass      \
   {                                             \
-    X##type##RegistrationClass () {             \
+    X ## type ## RegistrationClass () {             \
       ns3::TypeId tid = type::GetTypeId ();     \
       tid.GetParent ();                         \
     }                                           \
-} x_##type##RegistrationVariable
+  } x_ ## type ## RegistrationVariable
 
 namespace ns3 {