bug 202: header file conflict
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu, 16 Oct 2008 12:53:05 +0200
changeset 37525ab2feb083a0
parent 3751 d26d57ddf801
child 3758 e9b55c93049e
child 3761 8aed4fbf8f35
bug 202: header file conflict
src/core/config.h
src/node/channel.h
     1.1 --- a/src/core/config.h	Thu Oct 16 12:47:17 2008 +0200
     1.2 +++ b/src/core/config.h	Thu Oct 16 12:53:05 2008 +0200
     1.3 @@ -17,8 +17,8 @@
     1.4   *
     1.5   * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
     1.6   */
     1.7 -#ifndef CONFIG_H
     1.8 -#define CONFIG_H
     1.9 +#ifndef NS3_CONFIG_H
    1.10 +#define NS3_CONFIG_H
    1.11  
    1.12  #include "ptr.h"
    1.13  #include <string>
    1.14 @@ -139,4 +139,4 @@
    1.15  
    1.16  } // namespace ns3
    1.17  
    1.18 -#endif /* CONFIG_H */
    1.19 +#endif /* NS3_CONFIG_H */
     2.1 --- a/src/node/channel.h	Thu Oct 16 12:47:17 2008 +0200
     2.2 +++ b/src/node/channel.h	Thu Oct 16 12:53:05 2008 +0200
     2.3 @@ -14,8 +14,8 @@
     2.4   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     2.5   */
     2.6  
     2.7 -#ifndef CHANNEL_H
     2.8 -#define CHANNEL_H
     2.9 +#ifndef NS3_CHANNEL_H
    2.10 +#define NS3_CHANNEL_H
    2.11  
    2.12  #include <string>
    2.13  #include <stdint.h>
    2.14 @@ -69,4 +69,4 @@
    2.15  
    2.16  }; // namespace ns3
    2.17  
    2.18 -#endif /* CHANNEL_H */
    2.19 +#endif /* NS3_CHANNEL_H */