Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing obsolete _MINIX define

Browse Source 
Change-Id: Id33ac7e973d1c0e249b690fe44a597474fac6076
This commit is contained in:
Lionel Sambuc
2013-02-25 12:43:15 +01:00
parent f360500351
commit 8e4736f2df
102 changed files with 122 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/arpa/nameser_compat.h
View File

@@ -133,13 +133,13 @@ typedef struct {
unsigned arcount :16; /*%< number of resource entries */
} HEADER;
#ifdef _MINIX
#if defined(__minix) && defined(_NETBSD_SOURCE)
#define dh_id id
#define dh_qdcount qdcount
#define dh_ancount ancount
#define dh_nscount nscount
#define dh_arcount arcount
#endif
#endif /* defined(__minix) && defined(_NETBSD_SOURCE) */
#define PACKETSZ NS_PACKETSZ
#define MAXDNAME NS_MAXDNAME

4
include/lib.h
View File

@@ -9,10 +9,10 @@
#ifdef __NBSD_LIBC
#include <sys/featuretest.h> /* tell headers to include NetBSD stuff. */
#else /* !__NBSD_LIBC */
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#endif
#define _MINIX 1 /* tell headers to include MINIX stuff */
#define _NETBSD_SOURCE 1 /* tell headers to include MINIX stuff */
/* The following are so basic, all the lib files get them automatically. */
#include <minix/config.h> /* must be first */

10
include/minix/driver.h
View File

@@ -3,9 +3,9 @@
/* Types and constants shared between block and character drivers. */
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#define _MINIX 1 /* tell headers to include MINIX stuff */
#define _SYSTEM 1 /* get negative error number in <errno.h> */
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#define _NETBSD_SOURCE 1 /* tell headers to include MINIX stuff */
#define _SYSTEM 1 /* get negative error number in <errno.h> */
/* The following are so basic, all the *.c files get them automatically. */
#include <minix/config.h> /* MUST be first */
@@ -28,8 +28,8 @@
/* Base and size of a partition in bytes. */
struct device {
u64_t dv_base;
u64_t dv_size;
u64_t dv_base;
u64_t dv_size;
};
/* Generic receive function for all drivers. */

6
include/minix/drivers.h
View File

@@ -5,9 +5,9 @@
#ifndef _INC_DRIVERS_H
#define _INC_DRIVERS_H
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#define _MINIX 1 /* tell headers to include MINIX stuff */
#define _SYSTEM 1 /* get negative error number in <errno.h> */
#define _POSIX_SOURCE 1 /* tell headers to include POSIX stuff */
#define _NETBSD_SOURCE 1 /* tell headers to include MINIX stuff */
#define _SYSTEM 1 /* get negative error number in <errno.h> */
/* The following are so basic, all the *.c files get them automatically. */
#include <minix/config.h> /* MUST be first */

4
include/minix/termios.h
View File

@@ -166,7 +166,7 @@ int tcsetattr(int _filedes, int _opt_actions, const struct termios
#define VDISCARD 13 /* cc_c[VDISCARD] (^O) */
/* Extensions to baud rate settings. */
#ifdef _MINIX
#if defined(__minix) && defined(_NETBSD_SOURCE)
#define B57600 0x0100 /* 57600 baud */
#define B115200 0x0200 /* 115200 baud */
#define B230400 0x0400 /* 230400 baud */
@@ -175,7 +175,7 @@ int tcsetattr(int _filedes, int _opt_actions, const struct termios
#define B1843200 0x2000 /* 1843200 baud */
#define B3000000 0x4000 /* 3000000 baud */
#define B3686400 0x8000 /* 3686400 baud */
#endif /* _MINIX */
#endif /* defined(__minix) && defined(_NETBSD_SOURCE) */
/* These are the default settings used by the kernel and by 'stty sane' */

4
include/unistd.h
View File

@@ -323,7 +323,7 @@ int unlinkat(int, const char *, int);
*/
#ifdef __minix
int lseek64(int fd, u64_t _offset, int _whence, u64_t *_newpos);
#if defined(_MINIX)
#if defined(_NETBSD_SOURCE)
#include <minix/type.h>
int getprocnr(void);
@@ -337,7 +337,7 @@ gid_t getngid(endpoint_t proc_ep);
int getnucred(endpoint_t proc_ep, struct ucred *ucred);
ssize_t pread64(int fd, void *buf, size_t count, u64_t where);
ssize_t pwrite64(int fd, const void *buf, size_t count, u64_t where);
#endif /* __MINIX */
#endif /* defined(_NETBSD_SOURCE) */
#endif /* __minix */
#if defined(_NETBSD_SOURCE)