diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-01 16:35:50 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-01 16:35:50 -0800 |
commit | 1d54983bc4f7e96c0bb826138066cd926ab73b9d (patch) | |
tree | 842fca77cfe321b97c0f31ddaba823c0fe8f92b6 /src/misc | |
parent | 35e05b7e5a422c3c075711eba3b4329c35ac426f (diff) | |
download | abc-1d54983bc4f7e96c0bb826138066cd926ab73b9d.tar.gz abc-1d54983bc4f7e96c0bb826138066cd926ab73b9d.tar.bz2 abc-1d54983bc4f7e96c0bb826138066cd926ab73b9d.zip |
Minor changes to hash table and utilSignal.c.
Diffstat (limited to 'src/misc')
-rw-r--r-- | src/misc/hash/hashGen.h | 3 | ||||
-rw-r--r-- | src/misc/util/utilSignal.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/misc/hash/hashGen.h b/src/misc/hash/hashGen.h index 33359e89..257b9dba 100644 --- a/src/misc/hash/hashGen.h +++ b/src/misc/hash/hashGen.h @@ -87,7 +87,7 @@ struct Hash_Gen_t_ ***********************************************************************/ static int Hash_DefaultHashFuncStr( void * key, int nBins ) { - char* p = (const char*)key; + const char* p = (const char*)key; int h=0; for( ; *p ; ++p ) @@ -151,7 +151,6 @@ static inline Hash_Gen_t * Hash_GenAlloc( int fFreeKey) { Hash_Gen_t * p; - int i; assert(nBins > 0); p = ABC_CALLOC( Hash_Gen_t, 1 ); p->nBins = nBins; diff --git a/src/misc/util/utilSignal.c b/src/misc/util/utilSignal.c index 2b2d538c..6a793ce0 100644 --- a/src/misc/util/utilSignal.c +++ b/src/misc/util/utilSignal.c @@ -18,19 +18,19 @@ ***********************************************************************/ -#ifndef _MSC_VER - #include <main.h> #include <stdlib.h> -#include <unistd.h> #include <signal.h> -#include <hashGen.h> +#include "abc_global.h" +#include "hashGen.h" + +#ifndef _MSC_VER + +#include <unistd.h> #include <errno.h> #include <sys/types.h> #include <sys/wait.h> -#include "abc_global.h" - ABC_NAMESPACE_IMPL_START //////////////////////////////////////////////////////////////////////// |