summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/base/main/main.c10
-rw-r--r--src/bdd/cudd/cuddAddFind.c8
-rw-r--r--src/bdd/cudd/cuddApa.c8
-rw-r--r--src/bdd/cudd/cuddBddCorr.c8
-rw-r--r--src/bdd/cudd/cuddBridge.c8
-rw-r--r--src/bdd/cudd/cuddGenCof.c8
-rw-r--r--src/bdd/cudd/cuddGenetic.c8
-rw-r--r--src/bdd/cudd/cuddGroup.c14
-rw-r--r--src/bdd/cudd/cuddSat.c8
-rw-r--r--src/bdd/cudd/cuddSubsetSP.c8
-rw-r--r--src/bdd/cudd/cuddUtil.c8
-rw-r--r--src/bdd/cudd/cuddZddCount.c8
-rw-r--r--src/bdd/cudd/cuddZddSetop.c8
-rw-r--r--src/misc/util/abc_global.h1
-rw-r--r--src/phys/place/place_qpsolver.h9
15 files changed, 9 insertions, 113 deletions
diff --git a/src/base/main/main.c b/src/base/main/main.c
index 7fe224a9..7832bada 100644
--- a/src/base/main/main.c
+++ b/src/base/main/main.c
@@ -1,6 +1,12 @@
-extern int Abc_RealMain(int argc, char *argv[]);
+#include <misc/util/abc_global.h>
+
+ABC_NAMESPACE_IMPL_START
+
+int Abc_RealMain(int argc, char *argv[]);
+
+ABC_NAMESPACE_IMPL_END
int main(int argc, char *argv[])
{
- return Abc_RealMain(argc, argv);
+ return ABC_NAMESPACE_PREFIX Abc_RealMain(argc, argv);
}
diff --git a/src/bdd/cudd/cuddAddFind.c b/src/bdd/cudd/cuddAddFind.c
index c9cebeaf..77cf026f 100644
--- a/src/bdd/cudd/cuddAddFind.c
+++ b/src/bdd/cudd/cuddAddFind.c
@@ -89,10 +89,6 @@ static char rcsid[] DD_UNUSED = "$Id: cuddAddFind.c,v 1.8 2004/08/13 18:04:45 fa
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -103,10 +99,6 @@ static DdNode * addDoIthBit (DdManager *dd, DdNode *f, DdNode *index);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddApa.c b/src/bdd/cudd/cuddApa.c
index 548461da..c87c3d17 100644
--- a/src/bdd/cudd/cuddApa.c
+++ b/src/bdd/cudd/cuddApa.c
@@ -103,10 +103,6 @@ static DdNode *background, *zero;
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -118,10 +114,6 @@ static enum st__retval cuddApaStCountfree (char * key, char * value, char * arg)
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
diff --git a/src/bdd/cudd/cuddBddCorr.c b/src/bdd/cudd/cuddBddCorr.c
index 9cf3c64c..72c57c95 100644
--- a/src/bdd/cudd/cuddBddCorr.c
+++ b/src/bdd/cudd/cuddBddCorr.c
@@ -101,10 +101,6 @@ static int num_calls;
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -119,10 +115,6 @@ static enum st__retval CorrelCleanUp (char *key, char *value, char *arg);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
diff --git a/src/bdd/cudd/cuddBridge.c b/src/bdd/cudd/cuddBridge.c
index 94b388f5..e5b6ba77 100644
--- a/src/bdd/cudd/cuddBridge.c
+++ b/src/bdd/cudd/cuddBridge.c
@@ -106,10 +106,6 @@ static char rcsid[] DD_UNUSED = "$Id: cuddBridge.c,v 1.19 2008/04/25 06:42:55 fa
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -125,10 +121,6 @@ static DdNode * cuddBddTransferRecur (DdManager *ddS, DdManager *ddD, DdNode *f,
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
diff --git a/src/bdd/cudd/cuddGenCof.c b/src/bdd/cudd/cuddGenCof.c
index 8b881344..0f22aa2a 100644
--- a/src/bdd/cudd/cuddGenCof.c
+++ b/src/bdd/cudd/cuddGenCof.c
@@ -122,10 +122,6 @@ static char rcsid[] DD_UNUSED = "$Id: cuddGenCof.c,v 1.38 2005/05/14 17:27:11 fa
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -143,10 +139,6 @@ static DdNode * cuddBddSqueeze (DdManager *dd, DdNode *l, DdNode *u);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddGenetic.c b/src/bdd/cudd/cuddGenetic.c
index a333f3a9..46194bfe 100644
--- a/src/bdd/cudd/cuddGenetic.c
+++ b/src/bdd/cudd/cuddGenetic.c
@@ -134,10 +134,6 @@ static int cross; /* the number of crossovers to perform */
*/
#define STOREDD(i,j) storedd[(i)*(numvars+1)+(j)]
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -160,10 +156,6 @@ static int roulette (int *p1, int *p2);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddGroup.c b/src/bdd/cudd/cuddGroup.c
index 731f8147..e0b9ccf5 100644
--- a/src/bdd/cudd/cuddGroup.c
+++ b/src/bdd/cudd/cuddGroup.c
@@ -103,13 +103,7 @@ ABC_NAMESPACE_IMPL_START
/* Type declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
typedef int (*DD_CHKFP)(DdManager *, int, int);
-#ifdef __cplusplus
-}
-#endif
/*---------------------------------------------------------------------------*/
/* Variable declarations */
@@ -139,10 +133,6 @@ static unsigned int originalSize;
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -176,10 +166,6 @@ static int ddIsVarHandled (DdManager *dd, int index);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddSat.c b/src/bdd/cudd/cuddSat.c
index c92981d1..899901dd 100644
--- a/src/bdd/cudd/cuddSat.c
+++ b/src/bdd/cudd/cuddSat.c
@@ -111,10 +111,6 @@ static DdNode *one, *zero;
#define WEIGHT(weight, col) ((weight) == NULL ? 1 : weight[col])
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -129,10 +125,6 @@ static DdNode * getCube (DdManager *manager, st__table *visited, DdNode *f, int
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddSubsetSP.c b/src/bdd/cudd/cuddSubsetSP.c
index 84cae32c..dc490f16 100644
--- a/src/bdd/cudd/cuddSubsetSP.c
+++ b/src/bdd/cudd/cuddSubsetSP.c
@@ -158,10 +158,6 @@ static DdNode **currentQueuePage; /* current page */
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -179,10 +175,6 @@ static enum st__retval stPathTableDdFree (char *key, char *value, char *arg);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of Exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddUtil.c b/src/bdd/cudd/cuddUtil.c
index da591692..fe913fee 100644
--- a/src/bdd/cudd/cuddUtil.c
+++ b/src/bdd/cudd/cuddUtil.c
@@ -158,10 +158,6 @@ static long shuffleTable[STAB_SIZE];
#define bang(f) ((Cudd_IsComplement(f)) ? '!' : ' ')
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -188,10 +184,6 @@ static enum st__retval ddEpdFree (char * key, char * value, char * arg);
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddZddCount.c b/src/bdd/cudd/cuddZddCount.c
index aefdc124..a44a782c 100644
--- a/src/bdd/cudd/cuddZddCount.c
+++ b/src/bdd/cudd/cuddZddCount.c
@@ -95,10 +95,6 @@ static char rcsid[] DD_UNUSED = "$Id: cuddZddCount.c,v 1.14 2004/08/13 18:04:53
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -112,10 +108,6 @@ static enum st__retval st__zdd_count_dbl_free (char *key, char *value, char *arg
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/bdd/cudd/cuddZddSetop.c b/src/bdd/cudd/cuddZddSetop.c
index 3b8cdcc5..332607b9 100644
--- a/src/bdd/cudd/cuddZddSetop.c
+++ b/src/bdd/cudd/cuddZddSetop.c
@@ -107,10 +107,6 @@ static char rcsid[] DD_UNUSED = "$Id: cuddZddSetop.c,v 1.25 2004/08/13 18:04:54
/* Macro declarations */
/*---------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**AutomaticStart*************************************************************/
/*---------------------------------------------------------------------------*/
@@ -123,10 +119,6 @@ static void zddVarToConst (DdNode *f, DdNode **gp, DdNode **hp, DdNode *base, Dd
/**AutomaticEnd***************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
/*---------------------------------------------------------------------------*/
/* Definition of exported functions */
/*---------------------------------------------------------------------------*/
diff --git a/src/misc/util/abc_global.h b/src/misc/util/abc_global.h
index 96380a44..e3b01c2c 100644
--- a/src/misc/util/abc_global.h
+++ b/src/misc/util/abc_global.h
@@ -82,6 +82,7 @@
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
+#include <string.h>
////////////////////////////////////////////////////////////////////////
/// NAMESPACES ///
diff --git a/src/phys/place/place_qpsolver.h b/src/phys/place/place_qpsolver.h
index 9ddf6447..fc1bced8 100644
--- a/src/phys/place/place_qpsolver.h
+++ b/src/phys/place/place_qpsolver.h
@@ -16,10 +16,6 @@
ABC_NAMESPACE_HEADER_START
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus */
-
typedef float qps_float_t;
typedef struct qps_problem {
@@ -138,11 +134,6 @@ extern "C" {
/* this discards the private data structures assigned by qps_init() */
extern void qps_clean(qps_problem_t *);
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus */
-
-
ABC_NAMESPACE_HEADER_END
#endif /* _QPS_H */