diff options
Diffstat (limited to 'src/bdd/mtr')
-rw-r--r-- | src/bdd/mtr/mtr.h | 19 | ||||
-rw-r--r-- | src/bdd/mtr/mtrBasic.c | 5 | ||||
-rw-r--r-- | src/bdd/mtr/mtrGroup.c | 5 | ||||
-rw-r--r-- | src/bdd/mtr/mtrInt.h | 8 |
4 files changed, 30 insertions, 7 deletions
diff --git a/src/bdd/mtr/mtr.h b/src/bdd/mtr/mtr.h index 201329ae..189ac1be 100644 --- a/src/bdd/mtr/mtr.h +++ b/src/bdd/mtr/mtr.h @@ -36,6 +36,8 @@ /* Nested includes */ /*---------------------------------------------------------------------------*/ +ABC_NAMESPACE_HEADER_START + /*---------------------------------------------------------------------------*/ /* Constant declarations */ @@ -58,17 +60,18 @@ /* These are potential duplicates. */ #ifndef EXTERN # ifdef __cplusplus -# define EXTERN extern "C" +# ifdef ABC_NAMESPACE +# define EXTERN extern +# else +# define EXTERN extern "C" +# endif # else -# define EXTERN extern +# define EXTERN extern # endif #endif + #ifndef ARGS -# if defined(__STDC__) || defined(__cplusplus) -# define ARGS(protos) protos /* ANSI C */ -# else /* !(__STDC__ || __cplusplus) */ -# define ARGS(protos) () /* K&R C */ -# endif /* !(__STDC__ || __cplusplus) */ +#define ARGS(protos) protos #endif #if defined(__GNUC__) @@ -170,4 +173,6 @@ EXTERN MtrNode * Mtr_ReadGroups ARGS((FILE *fp, int nleaves)); /**AutomaticEnd***************************************************************/ +ABC_NAMESPACE_HEADER_END + #endif /* __MTR */ diff --git a/src/bdd/mtr/mtrBasic.c b/src/bdd/mtr/mtrBasic.c index 428fa0b1..56c78a23 100644 --- a/src/bdd/mtr/mtrBasic.c +++ b/src/bdd/mtr/mtrBasic.c @@ -36,6 +36,9 @@ #include "util_hack.h" #include "mtrInt.h" +ABC_NAMESPACE_IMPL_START + + /*---------------------------------------------------------------------------*/ /* Constant declarations */ @@ -424,3 +427,5 @@ Mtr_PrintTree( /* Definition of static functions */ /*---------------------------------------------------------------------------*/ +ABC_NAMESPACE_IMPL_END + diff --git a/src/bdd/mtr/mtrGroup.c b/src/bdd/mtr/mtrGroup.c index 363b776b..176643f4 100644 --- a/src/bdd/mtr/mtrGroup.c +++ b/src/bdd/mtr/mtrGroup.c @@ -36,6 +36,9 @@ #include "util_hack.h" #include "mtrInt.h" +ABC_NAMESPACE_IMPL_START + + /*---------------------------------------------------------------------------*/ /* Constant declarations */ /*---------------------------------------------------------------------------*/ @@ -688,3 +691,5 @@ mtrShiftHL( } /* end of mtrShiftHL */ +ABC_NAMESPACE_IMPL_END + diff --git a/src/bdd/mtr/mtrInt.h b/src/bdd/mtr/mtrInt.h index a8d5aa6c..2a470411 100644 --- a/src/bdd/mtr/mtrInt.h +++ b/src/bdd/mtr/mtrInt.h @@ -24,8 +24,12 @@ #ifndef _MTRINT #define _MTRINT + #include "mtr.h" +ABC_NAMESPACE_HEADER_START + + /*---------------------------------------------------------------------------*/ /* Nested includes */ /*---------------------------------------------------------------------------*/ @@ -62,4 +66,8 @@ /**AutomaticEnd***************************************************************/ + + +ABC_NAMESPACE_HEADER_END + #endif /* _MTRINT */ |