diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
| commit | 0871bffae307e0553e0c5186336189e8b55cf6a6 (patch) | |
| tree | 4571d1563fe33a53a57fea1c35fb668b9d33265f /src/aig/bar | |
| parent | f936cc0680c98ffe51b3a1716c996072d5dbf76c (diff) | |
| download | abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.gz abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.bz2 abc-0871bffae307e0553e0c5186336189e8b55cf6a6.zip | |
Version abc90215
Diffstat (limited to 'src/aig/bar')
| -rw-r--r-- | src/aig/bar/bar.c | 5 | ||||
| -rw-r--r-- | src/aig/bar/bar.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/aig/bar/bar.c b/src/aig/bar/bar.c index f802d60c..2c5065cb 100644 --- a/src/aig/bar/bar.c +++ b/src/aig/bar/bar.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "abc_global.h" #include "bar.h" //////////////////////////////////////////////////////////////////////// @@ -67,7 +68,7 @@ Bar_Progress_t * Bar_ProgressStart( FILE * pFile, int nItemsTotal ) if ( pFrame == NULL ) return NULL; if ( !Abc_FrameShowProgress(pFrame) ) return NULL; - p = (Bar_Progress_t *) malloc(sizeof(Bar_Progress_t)); + p = ABC_ALLOC( Bar_Progress_t, 1 ); memset( p, 0, sizeof(Bar_Progress_t) ); p->pFile = pFile; p->nItemsTotal = nItemsTotal; @@ -123,7 +124,7 @@ void Bar_ProgressStop( Bar_Progress_t * p ) { if ( p == NULL ) return; Bar_ProgressClean( p ); - free( p ); + ABC_FREE( p ); } /**Function************************************************************* diff --git a/src/aig/bar/bar.h b/src/aig/bar/bar.h index 814fbe6f..104c6f47 100644 --- a/src/aig/bar/bar.h +++ b/src/aig/bar/bar.h @@ -21,10 +21,6 @@ #ifndef __BAR_H__ #define __BAR_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef _WIN32 #define inline __inline // compatible with MS VS 6.0 #endif @@ -37,6 +33,10 @@ extern "C" { /// PARAMETERS /// //////////////////////////////////////////////////////////////////////// +#ifdef __cplusplus +extern "C" { +#endif + #define BAR_PROGRESS_USE 1 //////////////////////////////////////////////////////////////////////// |