qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH for-2.1 0/2] drop INLINE macro from the tree
Date: Thu, 19 Jun 2014 10:36:53 -0400	[thread overview]
Message-ID: <1403188615-17456-1-git-send-email-lcapitulino@redhat.com> (raw)

This series fixes the following build breakage:

"""
In file included from /usr/include/spice-server/spice.h:25:0,
                 from /home/lcapitulino/work/src/upstream/qemu/include/ui/qemu-spice.h:25,
                 from /home/lcapitulino/work/src/upstream/qemu/qemu-char.c:84:
/usr/include/spice-1/spice/macros.h:105:0: error: "INLINE" redefined [-Werror]
 #define INLINE inline
 ^
In file included from /home/lcapitulino/work/src/upstream/qemu/include/qemu/bswap.h:8:0,
                 from /home/lcapitulino/work/src/upstream/qemu/include/qemu-common.h:112,
                 from /home/lcapitulino/work/src/upstream/qemu/qemu-char.c:24:
/home/lcapitulino/work/src/upstream/qemu/include/fpu/softfloat.h:66:0: note: this is the location of the previous definition
 #define INLINE static inline
 ^
cc1: all warnings being treated as errors
make: *** [qemu-char.o] Error 1
"""

Yes, yes, I know. Libspice is to blame. But if this happened to libspice it
can happen with other external libs too. Besides, renaming keywords doesn't
look like a good practice to me. Let's just do it.

Luiz Capitulino (2):
  fpu: softfloat: drop INLINE macro
  audio: fmopl: drop INLINE macro

 fpu/softfloat-macros.h  | 38 +++++++++----------
 fpu/softfloat.c         | 48 ++++++++++++------------
 hw/audio/fmopl.c        | 31 ++++++++--------
 include/fpu/softfloat.h | 99 ++++++++++++++++++++++++-------------------------
 4 files changed, 107 insertions(+), 109 deletions(-)

-- 
1.9.3

             reply	other threads:[~2014-06-19 14:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19 14:36 Luiz Capitulino [this message]
2014-06-19 14:36 ` [Qemu-devel] [PATCH 1/2] fpu: softfloat: drop INLINE macro Luiz Capitulino
2014-06-19 14:59   ` Peter Maydell
2014-06-19 15:07     ` Luiz Capitulino
2014-06-19 14:36 ` [Qemu-devel] [PATCH 2/2] audio: fmopl: " Luiz Capitulino
2014-06-19 15:02 ` [Qemu-devel] [PATCH for-2.1 0/2] drop INLINE macro from the tree Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403188615-17456-1-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).