4 files changed, 11 insertions, 12 deletions

diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 3dc788e0..c65ee1bc 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -14568,7 +14568,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv )
     pPars->nLatchesCi  =  pNtk? Abc_NtkLatchNum(pNtk) : 0;
     pPars->nLatchesCo  =  pNtk? Abc_NtkLatchNum(pNtk) : 0;
     pPars->fLiftLeaves =  0;
-    pPars->pLutLib     =  (If_Lib_t *)Abc_FrameReadLibLut();
+    pPars->pLutLib     =  (If_LibLut_t *)Abc_FrameReadLibLut();
     pPars->pTimesArr   =  NULL;
     pPars->pTimesArr   =  NULL;
     pPars->pFuncCost   =  NULL;
@@ -15070,7 +15070,7 @@ int Abc_CommandIfif( Abc_Frame_t * pAbc, int argc, char ** argv )
     int c, fError;
 
     pPars->nLutSize     =  -1;    // the LUT size
-    pPars->pLutLib      = (If_Lib_t *)Abc_FrameReadLibLut();       // the LUT library
+    pPars->pLutLib      = (If_LibLut_t *)Abc_FrameReadLibLut();       // the LUT library
     pPars->DelayWire    = (float)0.5;    // wire delay
     pPars->nDegree      =   0;    // structure degree
     pPars->fCascade     =   0;    // cascade
@@ -27337,7 +27337,7 @@ int Abc_CommandAbc9If( Abc_Frame_t * pAbc, int argc, char ** argv )
     if ( pAbc->pLibLut == NULL )
     {
         Abc_Print( -1, "LUT library is not given. Using default LUT library.\n" );
-        pAbc->pLibLut = If_LutLibSetSimple( 6 );
+        pAbc->pLibLut = If_LibLutSetSimple( 6 );
     }
     Extra_UtilGetoptReset();
     while ( ( c = Extra_UtilGetopt( argc, argv, "KCFAGDEWSqaflepmrsdbgyojikcvh" ) ) != EOF )
diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c
index a30f7b87..9f8c7e0d 100644
--- a/src/base/abci/abcPrint.c
+++ b/src/base/abci/abcPrint.c
@@ -165,13 +165,13 @@ float Abc_NtkMfsTotalSwitching( Abc_Ntk_t * pNtk )
 ***********************************************************************/
 float Abc_NtkGetArea( Abc_Ntk_t * pNtk )
 {
-    If_Lib_t * pLutLib;
+    If_LibLut_t * pLutLib;
     Abc_Obj_t * pObj;
     float Counter = 0.0;
     int i;
     assert( Abc_NtkIsLogic(pNtk) );
     // get the library
-    pLutLib = (If_Lib_t *)Abc_FrameReadLibLut();
+    pLutLib = (If_LibLut_t *)Abc_FrameReadLibLut();
     if ( pLutLib && pLutLib->LutMax >= Abc_NtkGetFaninMax(pNtk) )
     {
         Abc_NtkForEachNode( pNtk, pObj, i )
diff --git a/src/base/abci/abcSpeedup.c b/src/base/abci/abcSpeedup.c
index 320f6aa5..a4a627ba 100644
--- a/src/base/abci/abcSpeedup.c
+++ b/src/base/abci/abcSpeedup.c
@@ -102,7 +102,7 @@ float Abc_NtkDelayTraceLut( Abc_Ntk_t * pNtk, int fUseLutLib )
     int fUseSorting = 1;
     int pPinPerm[32];
     float pPinDelays[32];
-    If_Lib_t * pLutLib;
+    If_LibLut_t * pLutLib;
     Abc_Obj_t * pNode, * pFanin;
     Vec_Ptr_t * vNodes;
     float tArrival, tRequired, tSlack, * pDelays;
@@ -110,7 +110,7 @@ float Abc_NtkDelayTraceLut( Abc_Ntk_t * pNtk, int fUseLutLib )
 
     assert( Abc_NtkIsLogic(pNtk) );
     // get the library
-    pLutLib = fUseLutLib?  (If_Lib_t *)Abc_FrameReadLibLut() : NULL;
+    pLutLib = fUseLutLib?  (If_LibLut_t *)Abc_FrameReadLibLut() : NULL;
     if ( pLutLib && pLutLib->LutMax < Abc_NtkGetFaninMax(pNtk) )
     {
         printf( "The max LUT size (%d) is less than the max fanin count (%d).\n", 
@@ -244,11 +244,11 @@ float Abc_NtkDelayTraceLut( Abc_Ntk_t * pNtk, int fUseLutLib )
 void Abc_NtkDelayTracePrint( Abc_Ntk_t * pNtk, int fUseLutLib, int fVerbose )
 {
     Abc_Obj_t * pNode;
-    If_Lib_t * pLutLib;
+    If_LibLut_t * pLutLib;
     int i, Nodes, * pCounters;
     float tArrival, tDelta, nSteps, Num;
     // get the library
-    pLutLib = fUseLutLib?  (If_Lib_t *)Abc_FrameReadLibLut() : NULL;
+    pLutLib = fUseLutLib?  (If_LibLut_t *)Abc_FrameReadLibLut() : NULL;
     if ( pLutLib && pLutLib->LutMax < Abc_NtkGetFaninMax(pNtk) )
     {
         printf( "The max LUT size (%d) is less than the max fanin count (%d).\n", 
@@ -467,12 +467,12 @@ unsigned Abc_NtkDelayTraceTCEdges( Abc_Ntk_t * pNtk, Abc_Obj_t * pNode, float tD
 {
     int pPinPerm[32];
     float pPinDelays[32];
-    If_Lib_t * pLutLib;
+    If_LibLut_t * pLutLib;
     Abc_Obj_t * pFanin;
     unsigned uResult = 0;
     float tRequired, * pDelays;
     int k;
-    pLutLib = fUseLutLib?  (If_Lib_t *)Abc_FrameReadLibLut() : NULL;
+    pLutLib = fUseLutLib?  (If_LibLut_t *)Abc_FrameReadLibLut() : NULL;
     tRequired = Abc_ObjRequired(pNode);
     if ( pLutLib == NULL )
     {
diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h
index 9b2640c5..9813061e 100644
--- a/src/base/main/mainInt.h
+++ b/src/base/main/mainInt.h
@@ -113,7 +113,6 @@ struct Abc_Frame_t_
     void *          pAbc85Ntl2;
     void *          pAbc85Best;
     void *          pAbc85Delay;
-//    If_Lib_t *      pAbc85Lib;
 
     EXT_ABC_FRAME   // plugin for external functionality
 };