New upstream version 1.2.4

[quagga-debian.git] / lib / memory.h

diff --git a/lib/memory.h b/lib/memory.h
index 501352993d211b76aad1f4b0bceddf14e9b9d956..9bef3fae5baaedc9af186de511e27345a04c685a 100644 (file)
--- a/lib/memory.h
+++ b/lib/memory.h
@@ -50,7 +50,7 @@ extern struct mlist mlists[];
 #define XFREE(mtype, ptr) \
   do { \
     mtype_zfree (__FILE__, __LINE__, (mtype), (ptr)); \
 #define XFREE(mtype, ptr) \
   do { \
     mtype_zfree (__FILE__, __LINE__, (mtype), (ptr)); \

-    ptr = NULL; } \
+    (ptr) = NULL; } \

   while (0)
 #define XSTRDUP(mtype, str) \
   mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))
   while (0)
 #define XSTRDUP(mtype, str) \
   mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))


@@ -60,7 +60,7 @@ extern struct mlist mlists[];
 #define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
 #define XFREE(mtype, ptr)          do { \
                                      zfree ((mtype), (ptr)); \
 #define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
 #define XFREE(mtype, ptr)          do { \
                                      zfree ((mtype), (ptr)); \

-                                     ptr = NULL; } \
+                                     (ptr) = NULL; } \

                                    while (0)
 #define XSTRDUP(mtype, str)        zstrdup ((mtype), (str))
 #endif /* MEMORY_LOG */
                                    while (0)
 #define XSTRDUP(mtype, str)        zstrdup ((mtype), (str))
 #endif /* MEMORY_LOG */