diff options
author | Juan Quintela <quintela@redhat.com> | 2009-09-23 01:19:00 +0200 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-25 19:51:45 +0000 |
commit | 86178a576b83e6687e8f67ed7de4255a5c30cf05 (patch) | |
tree | 2b5904df7cd31491006baf0d968f64bd927954a8 | |
parent | 2b321d697b6bab67c4d0b69303eee2944805b4f7 (diff) | |
download | qemu-86178a576b83e6687e8f67ed7de4255a5c30cf05.tar.gz qemu-86178a576b83e6687e8f67ed7de4255a5c30cf05.tar.bz2 qemu-86178a576b83e6687e8f67ed7de4255a5c30cf05.zip |
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>
-rw-r--r-- | gen-icount.h | 2 | ||||
-rw-r--r-- | hw/g364fb.c | 2 | ||||
-rw-r--r-- | hw/pflash_cfi01.c | 2 | ||||
-rw-r--r-- | hw/sh7750.c | 2 | ||||
-rw-r--r-- | hw/usb-bt.c | 2 | ||||
-rw-r--r-- | hw/xen_blkif.h | 4 | ||||
-rw-r--r-- | linux-user/arm/nwfpe/fpa11_cprt.c | 2 | ||||
-rw-r--r-- | target-ppc/translate.c | 8 |
8 files changed, 12 insertions, 12 deletions
diff --git a/gen-icount.h b/gen-icount.h index d4524d6634..01face23b4 100644 --- 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 d44fcc2d28..88e304823e 100644 --- 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 6ba496e541..dfdced97b0 100644 --- 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 cf9cf16159..933bbc0c7a 100644 --- 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 4c60d424fd..70fd4dd533 100644 --- 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 738b8fe53b..c0f4136228 100644 --- 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 fafa120c9b..c80b12400d 100644 --- 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 c8e8b6a4e5..8844ad2751 100644 --- 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(); |