include - minor compile fixes (including <ansi.h> in files that use it)
workaround for kernel/debug.h that causes <ansi.h> to be included in mpx.S indirectly.
This commit is contained in:
parent
354da24f5b
commit
2065c9982b
5 changed files with 12 additions and 4 deletions
|
@ -69,4 +69,8 @@
|
||||||
#define _POSIX_SOURCE 1
|
#define _POSIX_SOURCE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* What is a va_list? */
|
||||||
|
#include <stdarg.h>
|
||||||
|
#define _BSD_VA_LIST_ va_list
|
||||||
|
|
||||||
#endif /* ANSI_H */
|
#endif /* ANSI_H */
|
||||||
|
|
|
@ -34,10 +34,6 @@
|
||||||
#ifndef _ERR_H_
|
#ifndef _ERR_H_
|
||||||
#define _ERR_H_
|
#define _ERR_H_
|
||||||
|
|
||||||
#ifdef __minix
|
|
||||||
#define _BSD_VA_LIST_ va_list
|
|
||||||
#include <stdarg.h>
|
|
||||||
#else
|
|
||||||
/*
|
/*
|
||||||
* Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two
|
* Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two
|
||||||
* places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
|
* places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
|
||||||
|
@ -45,6 +41,9 @@
|
||||||
* for utilities to have to include one of them to include err.h, so we get
|
* for utilities to have to include one of them to include err.h, so we get
|
||||||
* _BSD_VA_LIST_ from <machine/ansi.h> and use it.
|
* _BSD_VA_LIST_ from <machine/ansi.h> and use it.
|
||||||
*/
|
*/
|
||||||
|
#ifdef __minix
|
||||||
|
#include <ansi.h>
|
||||||
|
#else
|
||||||
#include <machine/ansi.h>
|
#include <machine/ansi.h>
|
||||||
#endif
|
#endif
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
strings.h
|
strings.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <ansi.h>
|
||||||
|
|
||||||
/* Open Group Base Specifications Issue 6 (not complete) */
|
/* Open Group Base Specifications Issue 6 (not complete) */
|
||||||
_PROTOTYPE( char *index, (const char *_s, int _charwanted) );
|
_PROTOTYPE( char *index, (const char *_s, int _charwanted) );
|
||||||
_PROTOTYPE( int strcasecmp, (const char *_s1, const char *_s2) );
|
_PROTOTYPE( int strcasecmp, (const char *_s1, const char *_s2) );
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <utmp.h>
|
#include <utmp.h>
|
||||||
|
#include <ansi.h>
|
||||||
|
|
||||||
#ifdef _BSD_TIME_T_
|
#ifdef _BSD_TIME_T_
|
||||||
typedef _BSD_TIME_T_ time_t;
|
typedef _BSD_TIME_T_ time_t;
|
||||||
|
|
|
@ -7,9 +7,11 @@
|
||||||
* other kernel headers.
|
* other kernel headers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLY__
|
||||||
#include <ansi.h>
|
#include <ansi.h>
|
||||||
#include <minix/debug.h>
|
#include <minix/debug.h>
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Enable prints such as
|
/* Enable prints such as
|
||||||
* . send/receive failed due to deadlock or dead source or dead destination
|
* . send/receive failed due to deadlock or dead source or dead destination
|
||||||
|
|
Loading…
Reference in a new issue