Merge pull request #3370 from pguibert6WIND/default_vrf_initialization

[mirror_frr.git] / isisd / dict.h

diff --git a/isisd/dict.h b/isisd/dict.h
index 9395d1c0805867f1e4501cc9dab7c6d0d2cd09da..32683c57d58a054fcd057f62ca1d5c46eca66dde 100644 (file)
--- a/isisd/dict.h
+++ b/isisd/dict.h
@@ -14,17 +14,12 @@
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
  *
- * $Id: dict.h,v 1.3 2005/09/25 12:04:25 hasso Exp $
- * $Name:  $
  */
 
 #ifndef DICT_H
 #define DICT_H
 
 #include <limits.h>
-#ifdef KAZLIB_SIDEEFFECT_DEBUG
-#include "sfx.h"
-#endif
 
 /*
  * Blurb for inclusion into C++ translation units
@@ -44,16 +39,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
+       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;
 } dnode_t;
 
 typedef int (*dict_comp_t)(const void *, const void *);
@@ -61,29 +52,21 @@ 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;
-    dict_comp_t dict_compare;
-    dnode_alloc_t dict_allocnode;
-    dnode_free_t dict_freenode;
-    void *dict_context;
-    int dict_dupes;
-    #else
-    int dict_dummmy;
-    #endif
+       dnode_t dict_nilnode;
+       dictcount_t dict_nodecount;
+       dictcount_t dict_maxcount;
+       dict_comp_t dict_compare;
+       dnode_alloc_t dict_allocnode;
+       dnode_free_t dict_freenode;
+       void *dict_context;
+       int dict_dupes;
 } 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_t *dict_dictptr;
+       dnode_t dict_nilnode;
 } dict_load_t;
 
 extern dict_t *dict_create(dictcount_t, dict_comp_t);
@@ -124,18 +107,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
 }