C++ portability changes.

src/bool/lucky/lucky.c

@@ -19,7 +19,7 @@
 ABC_NAMESPACE_IMPL_START
 
 
-inline int memCompare(word* x, word*  y, int nVars)
+int memCompare(word* x, word*  y, int nVars)
 {
     int i;
     for(i=Kit_TruthWordNum_64bit( nVars )-1;i>=0;i--)

src/bool/lucky/luckyInt.h

@@ -109,24 +109,24 @@ static inline int luckyMin( int x, int y ) { return (x < y) ? x : y; }
 static inline int       luckyMax( int x, int y ) { return (x < y) ? y : x; }
 
 
-extern  inline int memCompare(word* x, word*  y, int nVars);
-extern  inline int Kit_TruthWordNum_64bit( int nVars );
+extern  int             memCompare(word* x, word*  y, int nVars);
+extern  int             Kit_TruthWordNum_64bit( int nVars );
 extern  Abc_TtStore_t * setTtStore(char * pFileInput);
-extern  inline void Abc_TruthStoreFree( Abc_TtStore_t * p );
-extern  inline void Kit_TruthChangePhase_64bit( word * pInOut, int nVars, int iVar );
-extern  inline void Kit_TruthNot_64bit(word * pIn, int nVars );
-extern  inline void Kit_TruthCopy_64bit( word * pOut, word * pIn, int nVars );
-extern  inline void Kit_TruthSwapAdjacentVars_64bit( word * pInOut, int nVars, int iVar );
-extern  inline int Kit_TruthCountOnes_64bit( word* pIn, int nVars );
+extern  void            Abc_TruthStoreFree( Abc_TtStore_t * p );
+extern  void            Kit_TruthChangePhase_64bit( word * pInOut, int nVars, int iVar );
+extern  void            Kit_TruthNot_64bit(word * pIn, int nVars );
+extern  void            Kit_TruthCopy_64bit( word * pOut, word * pIn, int nVars );
+extern  void            Kit_TruthSwapAdjacentVars_64bit( word * pInOut, int nVars, int iVar );
+extern  int             Kit_TruthCountOnes_64bit( word* pIn, int nVars );
 extern  void            simpleMinimal(word* x, word* pAux,word* minimal, permInfo* pi, int nVars);
-extern  permInfo* setPermInfoPtr(int var);
+extern  permInfo *      setPermInfoPtr(int var);
 extern  void            freePermInfoPtr(permInfo* x);
-extern  inline void  Kit_TruthSemiCanonicize_Yasha_simple( word* pInOut, int nVars, int * pStore );
-extern  inline unsigned  Kit_TruthSemiCanonicize_Yasha( word* pInOut, int nVars, char * pCanonPerm);
-extern  inline unsigned  Kit_TruthSemiCanonicize_Yasha1( word* pInOut, int nVars, char * pCanonPerm, int * pStore);
-extern  inline word luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase);
-extern  inline word luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase);
-extern  inline unsigned adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info);
+extern  void            Kit_TruthSemiCanonicize_Yasha_simple( word* pInOut, int nVars, int * pStore );
+extern  unsigned        Kit_TruthSemiCanonicize_Yasha( word* pInOut, int nVars, char * pCanonPerm);
+extern  unsigned        Kit_TruthSemiCanonicize_Yasha1( word* pInOut, int nVars, char * pCanonPerm, int * pStore);
+extern  word            luckyCanonicizer_final_fast_6Vars(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase);
+extern  word            luckyCanonicizer_final_fast_6Vars1(word InOut, int* pStore, char* pCanonPerm, unsigned* pCanonPhase);
+extern  unsigned        adjustInfoAfterSwap(char* pCanonPerm, unsigned uCanonPhase, int iVar, unsigned info);
 extern  void            resetPCanonPermArray_6Vars(char* x);
 extern  void            swap_ij( word* f,int totalVars, int varI, int varJ);
 

src/bool/lucky/luckySwap.c

@@ -33,7 +33,7 @@ static word mask[6][2] =   {
 };
 */
 
-inline int Kit_TruthWordNum_64bit( int nVars )  { return nVars <= 6 ? 1 : (1 << (nVars - 6));}
+int Kit_TruthWordNum_64bit( int nVars )  { return nVars <= 6 ? 1 : (1 << (nVars - 6));}
 
 inline int Kit_WordCountOnes_64bit(word x)
 {