d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stop using <X11/Xfuncproto.h> from x86emu.

Browse source 
The code included <X11/Xfuncproto.h> only for _X_ATTRIBUTE_PRINTF,
which tells some compilers to check the printf format string.  Remove
so ACK doesn't need any X11 headers.

Some machines don't have the X11 headers, or they need a flag like
-I/usr/X11R[67]/include to find them.
This commit is contained in:
George Koehler 2018-06-10 16:00:23 -04:00
parent 7edc835626
commit 5404dace3a
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plat/pc86/emu/README.md
View file

@ -1,4 +1,3 @@
The x86emu directory contains a copy of the xorg 8086 emulation library from The x86emu directory contains a modified copy of the xorg 8086 emulation
the X server. It's distributable under the MIT/X11 license, and so is library from the X server. It's distributable under the MIT/X11 license,
compatible with the ACK. and so is compatible with the ACK.

2
plat/pc86/emu/x86emu/x86emu/debug.h
View file

@ -189,7 +189,7 @@ extern "C" { /* Use "C" linkage when in C++ mode */
#endif #endif
extern void x86emu_inc_decoded_inst_len(int x); extern void x86emu_inc_decoded_inst_len(int x);
extern void x86emu_decode_printf(const char *x, ...) _X_ATTRIBUTE_PRINTF(1,2); extern void x86emu_decode_printf(const char *x, ...);
extern void x86emu_just_disassemble(void); extern void x86emu_just_disassemble(void);
extern void x86emu_single_step(void); extern void x86emu_single_step(void);
extern void x86emu_end_instr(void); extern void x86emu_end_instr(void);

5
plat/pc86/emu/x86emu/x86emu/regs.h
View file

@ -39,8 +39,6 @@
#ifndef __X86EMU_REGS_H #ifndef __X86EMU_REGS_H
#define __X86EMU_REGS_H #define __X86EMU_REGS_H
#include <X11/Xfuncproto.h>
/*---------------------- Macros and type definitions ----------------------*/ /*---------------------- Macros and type definitions ----------------------*/
#ifdef PACK #ifdef PACK
@ -331,8 +329,7 @@ extern "C" { /* Use "C" linkage when in C++ mode */
/* Function to log information at runtime */ /* Function to log information at runtime */
void printk(const char *fmt, ...) void printk(const char *fmt, ...);
_X_ATTRIBUTE_PRINTF(1, 2);
#ifdef __cplusplus #ifdef __cplusplus
} /* End of "C" linkage for C++ */ } /* End of "C" linkage for C++ */