diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-19 21:50:09 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-19 21:50:09 -0700 |
| commit | 6ad94cd988dba45747068625598b4dca96b5b34a (patch) | |
| tree | 8f99f1a30899785c3eeb9beaa053390ac661ea08 | |
| parent | 232fe09ee41afaacf6382d01ef9c6a046874b6da (diff) | |
| download | abc-6ad94cd988dba45747068625598b4dca96b5b34a.tar.gz abc-6ad94cd988dba45747068625598b4dca96b5b34a.tar.bz2 abc-6ad94cd988dba45747068625598b4dca96b5b34a.zip | |
Making changes suggested by Mark Jarvin.
| -rw-r--r-- | src/bdd/cudd/cudd.h | 10 | ||||
| -rw-r--r-- | src/bdd/cudd/cuddInt.h | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/bdd/cudd/cudd.h b/src/bdd/cudd/cudd.h index 07762456..ab88ba74 100644 --- a/src/bdd/cudd/cudd.h +++ b/src/bdd/cudd/cudd.h @@ -364,7 +364,7 @@ typedef int (*DD_QSFP)(const void *, const void *); SeeAlso [Cudd_NotCond] ******************************************************************************/ -#define Cudd_Not(node) ((DdNode *)((long)(node) ^ 01)) +#define Cudd_Not(node) ((DdNode *)((ptrint)(node) ^ 01)) /**Macro*********************************************************************** @@ -380,7 +380,7 @@ typedef int (*DD_QSFP)(const void *, const void *); SeeAlso [Cudd_Not] ******************************************************************************/ -#define Cudd_NotCond(node,c) ((DdNode *)((long)(node) ^ (c))) +#define Cudd_NotCond(node,c) ((DdNode *)((ptrint)(node) ^ (c))) /**Macro*********************************************************************** @@ -394,7 +394,7 @@ typedef int (*DD_QSFP)(const void *, const void *); SeeAlso [Cudd_Complement Cudd_IsComplement] ******************************************************************************/ -#define Cudd_Regular(node) ((DdNode *)((unsigned long)(node) & ~01)) +#define Cudd_Regular(node) ((DdNode *)((ptruint)(node) & ~01)) /**Macro*********************************************************************** @@ -408,7 +408,7 @@ typedef int (*DD_QSFP)(const void *, const void *); SeeAlso [Cudd_Regular Cudd_IsComplement] ******************************************************************************/ -#define Cudd_Complement(node) ((DdNode *)((unsigned long)(node) | 01)) +#define Cudd_Complement(node) ((DdNode *)((ptruint)(node) | 01)) /**Macro*********************************************************************** @@ -422,7 +422,7 @@ typedef int (*DD_QSFP)(const void *, const void *); SeeAlso [Cudd_Regular Cudd_Complement] ******************************************************************************/ -#define Cudd_IsComplement(node) ((int) ((long) (node) & 01)) +#define Cudd_IsComplement(node) ((int) ((ptrint) (node) & 01)) /**Macro*********************************************************************** diff --git a/src/bdd/cudd/cuddInt.h b/src/bdd/cudd/cuddInt.h index 07ae3e6c..f0aab056 100644 --- a/src/bdd/cudd/cuddInt.h +++ b/src/bdd/cudd/cuddInt.h @@ -247,6 +247,7 @@ typedef struct DdHook { /* hook list element */ struct DdHook *next; /* next element in the list */ } DdHook; +/* #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4 typedef long ptrint; typedef unsigned long ptruint; @@ -254,6 +255,10 @@ typedef unsigned long ptruint; typedef int ptrint; typedef unsigned int ptruint; #endif +*/ + +typedef ABC_PTRINT_T ptrint; +typedef ABC_PTRUINT_T ptruint; #ifdef __osf__ #pragma pointer_size save |