Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170403-1' into staging

[mirror_qemu.git] / slirp / mbuf.h

diff --git a/slirp/mbuf.h b/slirp/mbuf.h
index b144f1ce3a159bb029e65b49cc3036abd06c5456..893601ff9dc63c2d70dfa064c09a5ca405dce9cf 100644 (file)
--- a/slirp/mbuf.h
+++ b/slirp/mbuf.h
@@ -30,8 +30,8 @@
  * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp
  */
 
-#ifndef _MBUF_H_
-#define _MBUF_H_
+#ifndef MBUF_H
+#define MBUF_H
 
 #define MINCSIZE 4096  /* Amount to increase mbuf if too small */
 
@@ -79,13 +79,11 @@ struct mbuf {
        int     m_len;                  /* Amount of data in this mbuf */
 
        Slirp *slirp;
-       bool    arp_requested;
+       bool    resolution_requested;
        uint64_t expiration_date;
+       char   *m_ext;
        /* start of dynamic buffer area, must be last element */
-       union {
-               char    m_dat[1]; /* ANSI don't like 0 sized arrays */
-               char    *m_ext;
-       };
+       char    m_dat[];
 };
 
 #define ifq_prev m_prev