summaryrefslogtreecommitdiffstats
path: root/src/misc
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2014-10-12 09:10:27 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2014-10-12 09:10:27 -0700
commit3ac8aa9c12adb9593f498dc1ea33bbdce18e6713 (patch)
tree1c9e37fc2907d5d83f7d9960c9136acc1abbefe9 /src/misc
parentbc4164a466e566ff9d2e800aa3cc141622514135 (diff)
downloadabc-3ac8aa9c12adb9593f498dc1ea33bbdce18e6713.tar.gz
abc-3ac8aa9c12adb9593f498dc1ea33bbdce18e6713.tar.bz2
abc-3ac8aa9c12adb9593f498dc1ea33bbdce18e6713.zip
Recommended changes for portability.
Diffstat (limited to 'src/misc')
-rw-r--r--src/misc/extra/extraUtilSupp.c2
-rw-r--r--src/misc/util/utilFile.c2
-rw-r--r--src/misc/vec/vecPtr.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/misc/extra/extraUtilSupp.c b/src/misc/extra/extraUtilSupp.c
index baf9f3f6..bb513863 100644
--- a/src/misc/extra/extraUtilSupp.c
+++ b/src/misc/extra/extraUtilSupp.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include "misc/vec/vec.h"
#include "misc/vec/vecWec.h"
+#include "extra.h"
ABC_NAMESPACE_IMPL_START
@@ -302,7 +303,6 @@ void Abc_SuppTest( int nOnes, int nVars, int fUseSimple, int fCheck, int fVerbos
***********************************************************************/
Vec_Wrd_t * Abc_SuppReadMin( char * pFileName, int * pnVars )
{
- extern char * Extra_FileReadContents( char * pFileName );
Vec_Wrd_t * vRes; word uCube;
int nCubes = 0, nVars = -1, iVar;
char * pCur, * pToken, * pStart = "INPUT F-COVER";
diff --git a/src/misc/util/utilFile.c b/src/misc/util/utilFile.c
index c5c5a08f..4bb2f4c6 100644
--- a/src/misc/util/utilFile.c
+++ b/src/misc/util/utilFile.c
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#if defined(_MSC_VER) || defined(__MINGW32__)
-#include <Windows.h>
+#include <windows.h>
#include <process.h>
#include <io.h>
#else
diff --git a/src/misc/vec/vecPtr.h b/src/misc/vec/vecPtr.h
index e6125256..e7ed1aa9 100644
--- a/src/misc/vec/vecPtr.h
+++ b/src/misc/vec/vecPtr.h
@@ -883,8 +883,8 @@ static void Vec_PtrUniqify( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)() )
p->pArray[k++] = p->pArray[i];
p->nSize = k;
}
-static void Vec_PtrUniqify2( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)(), void (*Vec_PtrObjFree)(), Vec_Int_t * vCounts ) ___unused;
-static void Vec_PtrUniqify2( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)(), void (*Vec_PtrObjFree)(), Vec_Int_t * vCounts )
+static void Vec_PtrUniqify2( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)(void**, void**), void (*Vec_PtrObjFree)(void*), Vec_Int_t * vCounts ) ___unused;
+static void Vec_PtrUniqify2( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)(void**, void**), void (*Vec_PtrObjFree)(void*), Vec_Int_t * vCounts )
{
int i, k;
if ( vCounts )