diff options
| author | Josh Bailey <joshb@google.com> | 2012-03-24 08:35:20 -0700 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-07 13:54:37 -0700 |
| commit | 3f045a08812525505e165deea99a79447b44506b (patch) | |
| tree | a5c944b0584e0e5a14908a2ac9476637e7c1d7e6 /isisd/dict.h | |
| parent | 6902c69aa30a73ecd70ef8941518b541ca02b878 (diff) | |
isisd: add Google's changes to IS-IS
Diffstat (limited to 'isisd/dict.h')
| -rw-r--r-- | isisd/dict.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/isisd/dict.h b/isisd/dict.h index 9395d1c080..93edb7d603 100644 --- a/isisd/dict.h +++ b/isisd/dict.h @@ -22,9 +22,6 @@ #define DICT_H #include <limits.h> -#ifdef KAZLIB_SIDEEFFECT_DEBUG -#include "sfx.h" -#endif /* * Blurb for inclusion into C++ translation units @@ -44,16 +41,12 @@ typedef unsigned long dictcount_t; typedef enum { dnode_red, dnode_black } dnode_color_t; typedef struct dnode_t { - #if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG) struct dnode_t *dict_left; struct dnode_t *dict_right; struct dnode_t *dict_parent; dnode_color_t dict_color; const void *dict_key; void *dict_data; - #else - int dict_dummy; - #endif } dnode_t; typedef int (*dict_comp_t)(const void *, const void *); @@ -61,7 +54,6 @@ typedef dnode_t *(*dnode_alloc_t)(void *); typedef void (*dnode_free_t)(dnode_t *, void *); typedef struct dict_t { - #if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG) dnode_t dict_nilnode; dictcount_t dict_nodecount; dictcount_t dict_maxcount; @@ -70,20 +62,13 @@ typedef struct dict_t { dnode_free_t dict_freenode; void *dict_context; int dict_dupes; - #else - int dict_dummmy; - #endif } dict_t; typedef void (*dnode_process_t)(dict_t *, dnode_t *, void *); typedef struct dict_load_t { - #if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG) dict_t *dict_dictptr; dnode_t dict_nilnode; - #else - int dict_dummmy; - #endif } dict_load_t; extern dict_t *dict_create(dictcount_t, dict_comp_t); @@ -124,18 +109,12 @@ extern void dict_load_next(dict_load_t *, dnode_t *, const void *); extern void dict_load_end(dict_load_t *); extern void dict_merge(dict_t *, dict_t *); -#if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG) -#ifdef KAZLIB_SIDEEFFECT_DEBUG -#define dict_isfull(D) (SFX_CHECK(D)->dict_nodecount == (D)->dict_maxcount) -#else #define dict_isfull(D) ((D)->dict_nodecount == (D)->dict_maxcount) -#endif #define dict_count(D) ((D)->dict_nodecount) #define dict_isempty(D) ((D)->dict_nodecount == 0) #define dnode_get(N) ((N)->dict_data) #define dnode_getkey(N) ((N)->dict_key) #define dnode_put(N, X) ((N)->dict_data = (X)) -#endif #ifdef __cplusplus } |