commit 88e2f8e385614432d8499a4fb37f0d361cca30d6
author Marc-André Lureau <marcandre.lureau@gmail.com> Thu Feb 10 22:25:37 2022 +0000
committer Marc-André Lureau <marcandre.lureau@gmail.com> Thu Feb 10 22:25:37 2022 +0000
tree 490ae64df0a82f2b6fffe97a68d28120dda860d1
parent 630d673c143dc57d92f8c28888eb136927f6825d
parent 4399c89852c1981e539714cc6f592648e7088de6

Merge branch 'debug-fix' into 'master'

mbuf: Use SLIRP_DEBUG to enable mbuf debugging instead of DEBUG

See merge request slirp/libslirp!114

src/mbuf.h

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 @@
     ifm->ifs_next = ifm->ifs_prev = ifm;
 }
 
-#ifdef DEBUG
+#ifdef SLIRP_DEBUG
 #  define MBUF_DEBUG 1
 #else
 #  ifdef HAVE_VALGRIND

src/socket.c

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 @@
             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");
         }