diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2010-11-01 01:35:04 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2010-11-01 01:35:04 -0700 |
commit | 6130e39b18b5f53902e4eab14f6d5cdde5219563 (patch) | |
tree | 0db0628479a1b750e9af1f66cb8379ebd0913d31 /src/aig/bar | |
parent | f0e77f6797c0504b0da25a56152b707d3357f386 (diff) | |
download | abc-6130e39b18b5f53902e4eab14f6d5cdde5219563.tar.gz abc-6130e39b18b5f53902e4eab14f6d5cdde5219563.tar.bz2 abc-6130e39b18b5f53902e4eab14f6d5cdde5219563.zip |
initial commit of public abc
Diffstat (limited to 'src/aig/bar')
-rw-r--r-- | src/aig/bar/bar.c | 11 | ||||
-rw-r--r-- | src/aig/bar/bar.h | 16 |
2 files changed, 18 insertions, 9 deletions
diff --git a/src/aig/bar/bar.c b/src/aig/bar/bar.c index 2c5065cb..b5c31779 100644 --- a/src/aig/bar/bar.c +++ b/src/aig/bar/bar.c @@ -21,9 +21,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "abc_global.h" +#include "main.h" #include "bar.h" +ABC_NAMESPACE_IMPL_START + + //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -61,9 +66,7 @@ static void Bar_ProgressClean( Bar_Progress_t * p ); Bar_Progress_t * Bar_ProgressStart( FILE * pFile, int nItemsTotal ) { Bar_Progress_t * p; - void * pFrame; - extern int Abc_FrameShowProgress( void * p ); - extern void * Abc_FrameReadGlobalFrame(); + Abc_Frame_t * pFrame; pFrame = Abc_FrameReadGlobalFrame(); if ( pFrame == NULL ) return NULL; @@ -180,3 +183,5 @@ void Bar_ProgressClean( Bar_Progress_t * p ) //////////////////////////////////////////////////////////////////////// +ABC_NAMESPACE_IMPL_END + diff --git a/src/aig/bar/bar.h b/src/aig/bar/bar.h index 104c6f47..65c9ec6a 100644 --- a/src/aig/bar/bar.h +++ b/src/aig/bar/bar.h @@ -21,6 +21,7 @@ #ifndef __BAR_H__ #define __BAR_H__ + #ifdef _WIN32 #define inline __inline // compatible with MS VS 6.0 #endif @@ -33,9 +34,10 @@ /// PARAMETERS /// //////////////////////////////////////////////////////////////////////// -#ifdef __cplusplus -extern "C" { -#endif + + +ABC_NAMESPACE_HEADER_START + #define BAR_PROGRESS_USE 1 @@ -62,9 +64,11 @@ static inline void Bar_ProgressUpdate( Bar_Progress_t * p, int nItemsCur, if ( BAR_PROGRESS_USE && p && (nItemsCur < *((int*)p)) ) return; Bar_ProgressUpdate_int(p, nItemsCur, pString); } -#ifdef __cplusplus -} -#endif + + +ABC_NAMESPACE_HEADER_END + + #endif |