diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-01-21 04:30:10 -0800 |
| commit | 8014f25f6db719fa62336f997963532a14c568f6 (patch) | |
| tree | c691ee91a3a2d452a2bd24ac89a8c717beaa7af7 /src/misc/st | |
| parent | c44cc5de9429e6b4f1c05045fcf43c9cb96437b5 (diff) | |
| download | abc-8014f25f6db719fa62336f997963532a14c568f6.tar.gz abc-8014f25f6db719fa62336f997963532a14c568f6.tar.bz2 abc-8014f25f6db719fa62336f997963532a14c568f6.zip | |
Major restructuring of the code.
Diffstat (limited to 'src/misc/st')
| -rw-r--r-- | src/misc/st/st.c | 3 | ||||
| -rw-r--r-- | src/misc/st/st.h | 5 | ||||
| -rw-r--r-- | src/misc/st/stmm.c | 4 | ||||
| -rw-r--r-- | src/misc/st/stmm.h | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/misc/st/st.c b/src/misc/st/st.c index cadddb0b..2e2edc53 100644 --- a/src/misc/st/st.c +++ b/src/misc/st/st.c @@ -9,6 +9,7 @@ */ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "st.h" @@ -16,7 +17,7 @@ ABC_NAMESPACE_IMPL_START #define ST_NUMCMP(x,y) ((x) != (y)) -#define ST_NUMHASH(x,size) (ABC_ABS((long)x)%(size)) +#define ST_NUMHASH(x,size) (Abc_AbsInt((long)x)%(size)) //#define ST_PTRHASH(x,size) ((int)((ABC_PTRUINT_T)(x)>>2)%size) // 64-bit bug fix 9/17/2007 #define ST_PTRHASH(x,size) ((int)(((ABC_PTRUINT_T)(x)>>2)%size)) #define EQUAL(func, x, y) \ diff --git a/src/misc/st/st.h b/src/misc/st/st.h index d16fc4b6..50a8440e 100644 --- a/src/misc/st/st.h +++ b/src/misc/st/st.h @@ -11,10 +11,11 @@ /* /projects/hsis/CVS/utilities/st/st.h,v 1.1 1993/07/29 01:00:21 serdar Exp */ -#ifndef ST_INCLUDED +#ifndef ABC__misc__st__st_h +#define ABC__misc__st__st_h #define ST_INCLUDED -#include "abc_global.h" +#include "src/misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/st/stmm.c b/src/misc/st/stmm.c index 1305d5b0..dc883a67 100644 --- a/src/misc/st/stmm.c +++ b/src/misc/st/stmm.c @@ -8,14 +8,14 @@ * */ #include <stdio.h> -#include "extra.h" +#include "src/misc/extra/extra.h" #include "stmm.h" ABC_NAMESPACE_IMPL_START #define STMM_NUMCMP(x,y) ((x) != (y)) -#define STMM_NUMHASH(x,size) (ABC_ABS((long)x)%(size)) +#define STMM_NUMHASH(x,size) (Abc_AbsInt((long)x)%(size)) //#define STMM_PTRHASH(x,size) ((int)((ABC_PTRUINT_T)(x)>>2)%size) // 64-bit bug fix 9/17/2007 #define STMM_PTRHASH(x,size) ((int)(((ABC_PTRUINT_T)(x)>>2)%size)) #define EQUAL(func, x, y) \ diff --git a/src/misc/st/stmm.h b/src/misc/st/stmm.h index eee90073..1853ce36 100644 --- a/src/misc/st/stmm.h +++ b/src/misc/st/stmm.h @@ -11,10 +11,10 @@ /* /projects/hsis/CVS/utilities/st/st.h,v 1.1 1993/07/29 01:00:21 serdar Exp */ -#ifndef STMM_INCLUDED -#define STMM_INCLUDED +#ifndef ABC__misc__st__stmm_h +#define ABC__misc__st__stmm_h -#include "abc_global.h" +#include "src/misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START |