diff options
author | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
commit | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (patch) | |
tree | c66f27ec96c869f10ef53d73ed7dd5e5e0860605 /xorg-server/hw/xfree86/x86emu | |
parent | 6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (diff) | |
download | vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.gz vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.bz2 vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.zip |
Git update 24/2/2010"
Diffstat (limited to 'xorg-server/hw/xfree86/x86emu')
-rw-r--r-- | xorg-server/hw/xfree86/x86emu/validate.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/x86emu/validate.c b/xorg-server/hw/xfree86/x86emu/validate.c index 239f6c1f3..b8c4d12d1 100644 --- a/xorg-server/hw/xfree86/x86emu/validate.c +++ b/xorg-server/hw/xfree86/x86emu/validate.c @@ -673,7 +673,7 @@ int main(int argc) VAL_LONG_LONG_BINARY(cmp_long); VAL_BYTE_UNARY(daa_byte); - VAL_BYTE_UNARY(das_byte); // Fails for 0x9A (out of range anyway) + VAL_BYTE_UNARY(das_byte); /* Fails for 0x9A (out of range anyway) */ VAL_BYTE_UNARY(dec_byte); VAL_WORD_UNARY(dec_word); diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h index 5530a3ada..4c850a1bd 100644 --- a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h +++ b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h @@ -61,7 +61,7 @@ static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) : "cc"); } -#else // ! (__PIC__ && __i386__) +#else /* ! (__PIC__ && __i386__) */ #define x86EMU_HAS_HW_CPUID 1 static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) @@ -73,7 +73,7 @@ static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) : "cc"); } -#endif // __PIC__ && __i386__ +#endif /* __PIC__ && __i386__ */ -#endif // __X86EMU_PRIM_X86_GCC_H +#endif /* __X86EMU_PRIM_X86_GCC_H */ |