static and inline should came before the type of the functions

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/gen-icount.h b/gen-icount.h
index d4524d6634624c0884424080835aad7b5d7ad12f..01face23b4c0852c71238ab5639130c185124e66 100644 (file)
--- a/gen-icount.h
+++ b/gen-icount.h
@@ -40,7 +40,7 @@ static void gen_icount_end(TranslationBlock *tb, int num_insns)
     }
 }
 
-static void inline gen_io_start(void)
+static inline void gen_io_start(void)
 {
     TCGv_i32 tmp = tcg_const_i32(1);
     tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io));

diff --git a/hw/g364fb.c b/hw/g364fb.c
index d44fcc2d28b5654cf7ea2fb5ac75a9e0d3ecc3c0..88e304823ec6e5899088a158057cba33f3efa555 100644 (file)
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -268,7 +268,7 @@ static void g364fb_update_display(void *opaque)
     qemu_irq_raise(s->irq);
 }
 
-static void inline g364fb_invalidate_display(void *opaque)
+static inline void g364fb_invalidate_display(void *opaque)
 {
     G364State *s = opaque;
     int i;

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 6ba496e541c61a97aab95b5d63902989f1a63802..dfdced97b01236d98d9b6851e87bd03581fc347c 100644 (file)
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -195,7 +195,7 @@ static void pflash_update(pflash_t *pfl, int offset,
     }
 }
 
-static void inline pflash_data_write(pflash_t *pfl, target_phys_addr_t offset,
+static inline void pflash_data_write(pflash_t *pfl, target_phys_addr_t offset,
                           uint32_t value, int width)
 {
     uint8_t *p = pfl->storage;

diff --git a/hw/sh7750.c b/hw/sh7750.c
index cf9cf1615998365f3e7ba573e98977f6e075b9cb..933bbc0c7a160d2508eaa21a7ddd8a7d7a3cdafc 100644 (file)
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -69,7 +69,7 @@ typedef struct SH7750State {
     struct intc_desc intc;
 } SH7750State;
 
-static int inline has_bcr3_and_bcr4(SH7750State * s)
+static inline int has_bcr3_and_bcr4(SH7750State * s)
 {
        return (s->cpu->features & SH_FEATURE_BCR3_AND_BCR4);
 }

diff --git a/hw/usb-bt.c b/hw/usb-bt.c
index 4c60d424fd4ba351c930292c26708db45520727a..70fd4dd5334e10ffc60a7ae7320efdac3f49fb8c 100644 (file)
--- a/hw/usb-bt.c
+++ b/hw/usb-bt.c
@@ -363,7 +363,7 @@ static inline int usb_bt_fifo_dequeue(struct usb_hci_in_fifo_s *fifo,
     return len;
 }
 
-static void inline usb_bt_fifo_out_enqueue(struct USBBtState *s,
+static inline void usb_bt_fifo_out_enqueue(struct USBBtState *s,
                 struct usb_hci_out_fifo_s *fifo,
                 void (*send)(struct HCIInfo *, const uint8_t *, int),
                 int (*complete)(const uint8_t *, int),

diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h
index 738b8fe53bebfe25e5bd222da91140f70accae25..c0f4136228817d9976531ab28e7099395c19d1e0 100644 (file)
--- a/hw/xen_blkif.h
+++ b/hw/xen_blkif.h
@@ -70,7 +70,7 @@ enum blkif_protocol {
        BLKIF_PROTOCOL_X86_64 = 3,
 };
 
-static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
+static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
 {
        int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
 
@@ -85,7 +85,7 @@ static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque
                dst->seg[i] = src->seg[i];
 }
 
-static void inline blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
+static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
 {
        int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
 

diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c b/linux-user/arm/nwfpe/fpa11_cprt.c
index fafa120c9bb0c012f4b5fdd89f77761660dc8e6b..c80b12400d84fd2c1414317e7409b4f2053fb74e 100644 (file)
--- a/linux-user/arm/nwfpe/fpa11_cprt.c
+++ b/linux-user/arm/nwfpe/fpa11_cprt.c
@@ -147,7 +147,7 @@ unsigned int PerformFIX(const unsigned int opcode)
 }
 
 
-static unsigned int __inline__
+static __inline unsigned int
 PerformComparisonOperation(floatx80 Fn, floatx80 Fm)
 {
    FPA11 *fpa11 = GET_FPA11();

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index c8e8b6a4e56bfa4fb34839a9454d38ee38488ab2..8844ad2751f57c4681ba83df6e7707764bfa627f 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -2814,7 +2814,7 @@ static void gen_std(DisasContext *ctx)
 #endif
 /***                Integer load and store with byte reverse               ***/
 /* lhbrx */
-static void inline gen_qemu_ld16ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
+static inline void gen_qemu_ld16ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
 {
     tcg_gen_qemu_ld16u(arg1, arg2, ctx->mem_idx);
     if (likely(!ctx->le_mode)) {
@@ -2824,7 +2824,7 @@ static void inline gen_qemu_ld16ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
 GEN_LDX(lhbr, ld16ur, 0x16, 0x18, PPC_INTEGER);
 
 /* lwbrx */
-static void inline gen_qemu_ld32ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
+static inline void gen_qemu_ld32ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
 {
     tcg_gen_qemu_ld32u(arg1, arg2, ctx->mem_idx);
     if (likely(!ctx->le_mode)) {
@@ -2834,7 +2834,7 @@ static void inline gen_qemu_ld32ur(DisasContext *ctx, TCGv arg1, TCGv arg2)
 GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER);
 
 /* sthbrx */
-static void inline gen_qemu_st16r(DisasContext *ctx, TCGv arg1, TCGv arg2)
+static inline void gen_qemu_st16r(DisasContext *ctx, TCGv arg1, TCGv arg2)
 {
     if (likely(!ctx->le_mode)) {
         TCGv t0 = tcg_temp_new();
@@ -2849,7 +2849,7 @@ static void inline gen_qemu_st16r(DisasContext *ctx, TCGv arg1, TCGv arg2)
 GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER);
 
 /* stwbrx */
-static void inline gen_qemu_st32r(DisasContext *ctx, TCGv arg1, TCGv arg2)
+static inline void gen_qemu_st32r(DisasContext *ctx, TCGv arg1, TCGv arg2)
 {
     if (likely(!ctx->le_mode)) {
         TCGv t0 = tcg_temp_new();