From 2d763d213865e916092d4065fbe5bc206f30e32f Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri, 13 May 2022 16:23:10 +0200
Subject: vmstate: only enable when building under GNU C

To be able to use typeof.

Fixes #24604
---
 src/state.c   | 4 ++++
 src/vmstate.c | 4 ++++
 src/vmstate.h | 7 ++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/state.c b/src/state.c
index 8708547..770711c 100644
--- a/src/state.c
+++ b/src/state.c
@@ -26,6 +26,8 @@
 #include "vmstate.h"
 #include "stream.h"
 
+#ifdef HAVE_VMSTATE
+
 static int slirp_tcp_post_load(void *opaque, int version)
 {
     tcp_template((struct tcpcb *)opaque);
@@ -377,3 +379,5 @@ int slirp_state_version(void)
 {
     return 4;
 }
+
+#endif /* HAVE_VMSTATE */
diff --git a/src/vmstate.c b/src/vmstate.c
index 68cc172..c7fc5a3 100644
--- a/src/vmstate.c
+++ b/src/vmstate.c
@@ -45,6 +45,8 @@
 #include "stream.h"
 #include "vmstate.h"
 
+#ifdef HAVE_VMSTATE
+
 static int get_nullptr(SlirpIStream *f, void *pv, size_t size,
                        const VMStateField *field)
 {
@@ -442,3 +444,5 @@ int slirp_vmstate_load_state(SlirpIStream *f, const VMStateDescription *vmsd,
     }
     return ret;
 }
+
+#endif /* HAVE_VMSTATE */
diff --git a/src/vmstate.h b/src/vmstate.h
index e3e2459..64dd256 100644
--- a/src/vmstate.h
+++ b/src/vmstate.h
@@ -39,6 +39,9 @@
 #ifndef VMSTATE_H_
 #define VMSTATE_H_
 
+#ifdef __GNUC__
+#define HAVE_VMSTATE 1
+
 #include <unistd.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -392,4 +395,6 @@ extern const VMStateInfo slirp_vmstate_info_tmp;
         .flags = VMS_END,     \
     }
 
-#endif
+#endif /* __GNUC__ */
+
+#endif /* VMSTATE_H_ */
-- 
cgit v1.1