Merge branch 'debug-fix' into 'master'

mbuf: Use SLIRP_DEBUG to enable mbuf debugging instead of DEBUG

See merge request slirp/libslirp!114

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mbuf.h b/src/mbuf.h
index 34e697a..aedfc71 100644
--- a/src/mbuf.h
+++ b/src/mbuf.h
@@ -134,7 +134,7 @@ static inline void ifs_init(struct mbuf *ifm)
     ifm->ifs_next = ifm->ifs_prev = ifm;
 }
 
-#ifdef DEBUG
+#ifdef SLIRP_DEBUG
 #  define MBUF_DEBUG 1
 #else
 #  ifdef HAVE_VALGRIND
diff --git a/src/socket.c b/src/socket.c
index 3859919..f7af028 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -375,7 +375,7 @@ int sosendoob(struct socket *so)
             len += n;
         }
         n = slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */
-#ifdef DEBUG
+#ifdef SLIRP_DEBUG
         if (n != len) {
             DEBUG_ERROR("Didn't send all data urgently XXXXX");
         }