From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxdSg-0005XC-OE for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxdSZ-0001Gl-9B for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:37:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxdSZ-0001GW-1A for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:37:03 -0400 From: Luiz Capitulino Date: Thu, 19 Jun 2014 10:36:53 -0400 Message-Id: <1403188615-17456-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH for-2.1 0/2] drop INLINE macro from the tree List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org 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