_MINIX_SYSTEM - fixes for in-minix crossbuild

	. define _MINIX_SYSTEM for all system code from minix.service.mk
	. hide some system-level declarations and definitions
	  behind _MINIX_SYSTEM to cleanly fix host tool build problems on
	  Minix (such as: NONE being defined and paddr_t being used but not
	  declared)
	. the similar definition _SYSTEM is unsuitable as it changes the
	  values of errno definitions

Change-Id: I407de79e2575115243a074b16e79546a279cfa3e

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 98e32b89f1984e0674fb1207793534a6e90f51c0..ea6e9f6450fbacc6863d0eee88e111b4c4ecf6dc 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -39,6 +39,8 @@
  *       user space and converted into a concatenated argument list).
  */
 
+#define _MINIX_SYSTEM 1
+
 #include <minix/config.h>
 #include <minix/endpoint.h>
 #include <minix/paths.h>

diff --git a/commands/service/parse.c b/commands/service/parse.c
index fe2433687db6c78ec6d741aaeffea263646987b9..478d2fa550f21b1e3a9744e62751ef513b68423a 100644 (file)
--- a/commands/service/parse.c
+++ b/commands/service/parse.c
@@ -1,4 +1,6 @@
 
+#define _MINIX_SYSTEM 1
+
 #include <stdarg.h>
 #include <assert.h>
 #include <stdlib.h>

diff --git a/commands/svrctl/svrctl.c b/commands/svrctl/svrctl.c
index a481eabc18ddd7969d1245a36ba3245eab0de05f..820fe38911adeaeae6490c56ae2da4f955cafa12 100644 (file)
--- a/commands/svrctl/svrctl.c
+++ b/commands/svrctl/svrctl.c
@@ -1,3 +1,5 @@
+#define _MINIX_SYSTEM 1
+
 #include <sys/svrctl.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/include/minix/ds.h b/include/minix/ds.h
index 3a8c6db473a0c3cd33618e2bb936ee492d271868..ebe24f3ed32d61f19692491616b34141f7c2c1bf 100644 (file)
--- a/include/minix/ds.h
+++ b/include/minix/ds.h
@@ -3,6 +3,8 @@
 #ifndef _MINIX_DS_H
 #define _MINIX_DS_H
 
+#ifdef _MINIX_SYSTEM
+
 #include <sys/types.h>
 #include <minix/endpoint.h>
 
@@ -66,5 +68,7 @@ int ds_delete_label(const char *ds_name);
 int ds_subscribe(const char *regex, int flags);
 int ds_check(char *ds_name, int *type, endpoint_t *owner_e);
 
+#endif /* _MINIX_SYSTEM */
+
 #endif /* _MINIX_DS_H */
 

diff --git a/include/minix/endpoint.h b/include/minix/endpoint.h
index 0cf3f3bb7f73a7bcc2c24eaaf1cc8c0711aca81e..74ba24053b4bd5549cc568aa96632f5c7101a9d4 100644 (file)
--- a/include/minix/endpoint.h
+++ b/include/minix/endpoint.h
@@ -2,6 +2,8 @@
 #ifndef _MINIX_ENDPOINT_H
 #define _MINIX_ENDPOINT_H 1
 
+#ifdef _MINIX_SYSTEM
+
 #include <minix/sys_config.h>
 #include <minix/com.h>
 #include <limits.h>
@@ -68,4 +70,6 @@
 #define _ENDPOINT_P(e) \
        ((((e)+MAX_NR_TASKS) & (_ENDPOINT_GENERATION_SIZE - 1)) - MAX_NR_TASKS)
 
+#endif /* _MINIX_SYSTEM */
+
 #endif

diff --git a/include/minix/param.h b/include/minix/param.h
index 90a8b167619d4cc94368eaa80fe9c4df9f5dafd0..6e50debe8d5ad000139a91674f6ada260a3ea38f 100644 (file)
--- a/include/minix/param.h
+++ b/include/minix/param.h
@@ -8,6 +8,7 @@
 /* Number of processes contained in the system image. */
 #define NR_BOOT_PROCS   (NR_TASKS + LAST_SPECIAL_PROC_NR + 1)
 
+#ifdef _MINIX_SYSTEM
 /* This is used to obtain system information through SYS_GETINFO. */
 #define MAXMEMMAP 40
 typedef struct kinfo {
@@ -44,5 +45,6 @@ typedef struct kinfo {
        int kernel_allocated_bytes;             /* used by kernel */
        int kernel_allocated_bytes_dynamic;     /* used by kernel (runtime) */
 } kinfo_t;
+#endif /* _MINIX_SYSTEM */
 
 #endif

diff --git a/lib/libaudiodriver/Makefile b/lib/libaudiodriver/Makefile
index eb2319972869765bbe3dd473823a0b8c4cc0551e..c4d84ab0d4417814b9249c9c84c1d0ada1c473ad 100644 (file)
--- a/lib/libaudiodriver/Makefile
+++ b/lib/libaudiodriver/Makefile
@@ -1,6 +1,7 @@
 # Makefile for the common audio framework
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 LIB=    audiodriver
 SRCS=   audio_fw.c liveupdate.c

diff --git a/lib/libbdev/Makefile b/lib/libbdev/Makefile
index 3be2dad683a8113f5df62c7e16fa2da52cb154e1..bf0e1c01c460b50c793f168b91a34e42f25fd520 100644 (file)
--- a/lib/libbdev/Makefile
+++ b/lib/libbdev/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libbdev
 .include <bsd.own.mk>

diff --git a/lib/libblockdriver/Makefile b/lib/libblockdriver/Makefile
index c30150399e101f75fa44fd5f2ac8671191e1724b..e61dc69bcd50b16a8ec708113448226b2b1f80ec 100644 (file)
--- a/lib/libblockdriver/Makefile
+++ b/lib/libblockdriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libblockdriver
 .include <bsd.own.mk>

diff --git a/lib/libc/sys-minix/minix_rs.c b/lib/libc/sys-minix/minix_rs.c
index d858556c24941d63b22d2a4aeab0a398ec08243d..c0c0d38b581f49e5060d8865bb840f9e2012274c 100644 (file)
--- a/lib/libc/sys-minix/minix_rs.c
+++ b/lib/libc/sys-minix/minix_rs.c
@@ -1,4 +1,5 @@
 #define _SYSTEM        1
+#define _MINIX_SYSTEM  1
 
 #include <sys/cdefs.h>
 

diff --git a/lib/libc/sys-minix/mmap.c b/lib/libc/sys-minix/mmap.c
index ca6b5f532850d4e2ae48a3468c44cfe7c01524af..64b0b5ff027ab723142fdd5960e735d691fdb4e5 100644 (file)
--- a/lib/libc/sys-minix/mmap.c
+++ b/lib/libc/sys-minix/mmap.c
@@ -1,4 +1,5 @@
 #define _SYSTEM 1
+#define _MINIX_SYSTEM 1
 #include <sys/cdefs.h>
 #include "namespace.h"
 #include <lib.h>

diff --git a/lib/libc/sys-minix/sem.c b/lib/libc/sys-minix/sem.c
index 6f961d51b67b9110fa884e2634bd12f7435f6073..de8ba6c7faefe4e2caa6d6f0d8fb4f34df69b35f 100644 (file)
--- a/lib/libc/sys-minix/sem.c
+++ b/lib/libc/sys-minix/sem.c
@@ -1,5 +1,6 @@
 #define __USE_MISC
 #define _SYSTEM        1
+#define _MINIX_SYSTEM  1
 
 #include <sys/cdefs.h>
 #include <lib.h>

diff --git a/lib/libc/sys-minix/shmat.c b/lib/libc/sys-minix/shmat.c
index 2fa19bfe8b5fc4706eb72f6b408020510cef2a16..aa99007b40de9bcb21db5edf9959ea329114a67e 100644 (file)
--- a/lib/libc/sys-minix/shmat.c
+++ b/lib/libc/sys-minix/shmat.c
@@ -1,4 +1,5 @@
 #define _SYSTEM        1
+#define _MINIX_SYSTEM  1
 
 #include <sys/cdefs.h>
 #include <lib.h>

diff --git a/lib/libc/sys-minix/shmctl.c b/lib/libc/sys-minix/shmctl.c
index 474ecc39c96fb5be1d707a2bda3a9304dff27b1c..e3d10e7601c675f7f0fb688e86189ded800f0da3 100644 (file)
--- a/lib/libc/sys-minix/shmctl.c
+++ b/lib/libc/sys-minix/shmctl.c
@@ -1,4 +1,5 @@
 #define _SYSTEM        1
+#define _MINIX_SYSTEM  1
 
 #include <sys/cdefs.h>
 #include <lib.h>

diff --git a/lib/libc/sys-minix/stack_utils.c b/lib/libc/sys-minix/stack_utils.c
index 77da25f297515807aa135cd2b9631d34ccefb53a..95bf5d228206301b6bb1939bb58ab1fc8408acc1 100644 (file)
--- a/lib/libc/sys-minix/stack_utils.c
+++ b/lib/libc/sys-minix/stack_utils.c
@@ -3,6 +3,8 @@
  * Author: Lionel A. Sambuc. 
  */
 
+#define _MINIX_SYSTEM
+
 #include <sys/cdefs.h>
 #include "namespace.h"
 #include <lib.h>

diff --git a/lib/libchardriver/Makefile b/lib/libchardriver/Makefile
index e32df43164207c76cde79b6145f7570d01ac0dc7..b6997d01f0234ebc98a220c101d698503ff982c6 100644 (file)
--- a/lib/libchardriver/Makefile
+++ b/lib/libchardriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libchardriver
 .include <bsd.own.mk>

diff --git a/lib/libclkconf/Makefile b/lib/libclkconf/Makefile
index 7c4acfb9d4266f39416d18c6681c22fab156cd25..49cb3c6593cd328651325331062a12b5b21d506b 100644 (file)
--- a/lib/libclkconf/Makefile
+++ b/lib/libclkconf/Makefile
@@ -3,7 +3,7 @@ NOCLANGERROR=yes
 #
 # Makefile for libclkconf
 
-CPPFLAGS+= -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM -D_MINIX_SYSTEM
 
 LIB=   clkconf
 

diff --git a/lib/libddekit/build/ddekit/Makefile b/lib/libddekit/build/ddekit/Makefile
index a37b91a62ebe2fa6195fea6370674b8c7c91166c..9f789d9e02321f8ed5504e24ddd508e88f2be570 100644 (file)
--- a/lib/libddekit/build/ddekit/Makefile
+++ b/lib/libddekit/build/ddekit/Makefile
@@ -7,7 +7,7 @@ VPATH = $(SRC_DIR)
 
 SRCS = pci.c printf.c mem.c pgtab.c dde.c initcall.c thread.c condvar.c lock.c semaphore.c timer.c panic.c irq.c resource.c msg_queue.c
 
-CFLAGS +=  -D_NETBSD_SOURCE
+CPPFLAGS +=  -D_NETBSD_SOURCE -D_MINIX_SYSTEM
 
 .include <bsd.lib.mk>
 

diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile
index 03b5a7e7e98de02af1b3424e8541a959c5191326..ee86fbf27810b6eddde04d61d50bdf61740f2954 100644 (file)
--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libgpio
 
-CPPFLAGS+= -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM -D_MINIX_SYSTEM
 
 LIB=   gpio
 

diff --git a/lib/libi2cdriver/Makefile b/lib/libi2cdriver/Makefile
index 570d41578ac5c58eaf4f480e9bbabe7b809f26ff..066ecc8abfd7367d72e59d79780e159dc3733868 100644 (file)
--- a/lib/libi2cdriver/Makefile
+++ b/lib/libi2cdriver/Makefile
@@ -1,6 +1,8 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
 
+CPPFLAGS+=-D_MINIX_SYSTEM
+
 # Makefile for libi2cdriver
 
 LIB=   i2cdriver

diff --git a/lib/libinputdriver/Makefile b/lib/libinputdriver/Makefile
index 3d42b72ae05c51eac5ddffaa55ae2a8fe803a735..032a5c9aa8e5a51c4abd644ba4f77b1f6ea087ee 100644 (file)
--- a/lib/libinputdriver/Makefile
+++ b/lib/libinputdriver/Makefile
@@ -1,5 +1,6 @@
 # Makefile for libinputdriver
 .include <bsd.own.mk>
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 LIB=   inputdriver
 

diff --git a/lib/libminixfs/Makefile b/lib/libminixfs/Makefile
index 47bd7d3ec5e63af86baf420c66ca077e407d362b..f714dfebf8f43be3693528274bed114d9d539dbc 100644 (file)
--- a/lib/libminixfs/Makefile
+++ b/lib/libminixfs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libminixfs
 .include <bsd.own.mk>

diff --git a/lib/libnetdriver/Makefile b/lib/libnetdriver/Makefile
index 19e2ab0ca08de86384f4ab83208668bc9817e723..00b142b1f14fe9913c7ff5f839d84175719bb618 100644 (file)
--- a/lib/libnetdriver/Makefile
+++ b/lib/libnetdriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libnetdriver
 

diff --git a/lib/libnetsock/Makefile b/lib/libnetsock/Makefile
index 657717be02b91a04aea1e91bf49cd8934a96cc1b..e55e699adda028e42da876e071542a1c50ba17ff 100644 (file)
--- a/lib/libnetsock/Makefile
+++ b/lib/libnetsock/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 LIB = netsock
 

diff --git a/lib/libpuffs/Makefile b/lib/libpuffs/Makefile
index 0de6c9a558e852997cefb4de426bb1e6db8bfe95..fd47ff51f3635e075a6213266b8dd37ef0260ee8 100644 (file)
--- a/lib/libpuffs/Makefile
+++ b/lib/libpuffs/Makefile
@@ -23,6 +23,7 @@ SRCS+=                inode.c link.c misc.c mount.c open.c path.c path_puffs.c \
                protect.c read.c stadir.c time.c utility.c table.c
 
 CPFFLAGS+=-Dlchown=chown -Dlchmod=chmod
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 NOGCCERROR=yes
 NOCLANGERROR=yes

diff --git a/lib/libsffs/Makefile b/lib/libsffs/Makefile
index 4b716ba61ab6a61485e71afc60da82b2f5f7c451..4fb0b80b07f2fcf1ed123a2d839e9c7b37201050 100644 (file)
--- a/lib/libsffs/Makefile
+++ b/lib/libsffs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libsffs
 .include <bsd.own.mk>

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index 8365dba133b08caa199d4b74e685d4f59b4294da..4d09fa4b985335d61bb21090f47c624f64941b2a 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -4,6 +4,8 @@ NOCLANGERROR=yes
 # Makefile for libsys
 .include <bsd.own.mk>
 
+CPPFLAGS+= -D_MINIX_SYSTEM -D_SYSTEM
+
 LIB=           sys
 
 CFLAGS+=       -fno-builtin

diff --git a/lib/libsys/asynsend.c b/lib/libsys/asynsend.c
index bded01be1768f6ce3e7f4b1fc0b2cec24c603e15..59ca8b553eccb266a6fa35932355e650c9280cca 100644 (file)
--- a/lib/libsys/asynsend.c
+++ b/lib/libsys/asynsend.c
@@ -1,4 +1,3 @@
-#define _SYSTEM                1
 
 #include <minix/config.h>
 #include <assert.h> 

diff --git a/lib/libsys/syslib.h b/lib/libsys/syslib.h
index 7b0028d7324c06240cd3e5055e60a93fb7ea33d4..ba1add6a635fee80b13d7c9c28a7b38b0a542d8d 100644 (file)
--- a/lib/libsys/syslib.h
+++ b/lib/libsys/syslib.h
@@ -1,7 +1,5 @@
 /*     syslib.h - System library common definitions.   */
 
-#define _SYSTEM
-
 #include <lib.h>
 #include <minix/com.h>
 #include <minix/syslib.h>

diff --git a/lib/libvirtio/Makefile b/lib/libvirtio/Makefile
index 7049504d83d47b92b6f892b5b5ac48a1ec1a9849..1df3297dc8bf86691d74f23e1b7cb1701e9df5cd 100644 (file)
--- a/lib/libvirtio/Makefile
+++ b/lib/libvirtio/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libvirtio
 .include <bsd.own.mk>

diff --git a/lib/libvtreefs/Makefile b/lib/libvtreefs/Makefile
index dc47359034b952fafb97abf9e4b1b5bf681ecfa8..35f091728dbbc6806dbdea44e403159d7e4d39a0 100644 (file)
--- a/lib/libvtreefs/Makefile
+++ b/lib/libvtreefs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM
 
 # Makefile for libvtreefs
 

diff --git a/share/mk/minix.service.mk b/share/mk/minix.service.mk
index eac1032c1d9527986ddba863303bf3f7fd5fa3f0..3ab8be9d04ab748edbc93d114325bc50e2d67233 100644 (file)
--- a/share/mk/minix.service.mk
+++ b/share/mk/minix.service.mk
@@ -35,4 +35,7 @@ LDFLAGS+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
 
 .endif # ${MACHINE_ARCH} == "earm"
 
+# Get (more) internal minix definitions and declarations.
+CPPFLAGS += -D_MINIX_SYSTEM=1
+
 .include <bsd.prog.mk>

diff --git a/sys/arch/i386/include/multiboot.h b/sys/arch/i386/include/multiboot.h
index bc07f689de94d7f7360fbe6f53beecf7900d528a..a11d41e9026fc469f4319f256b233611cff76e62 100644 (file)
--- a/sys/arch/i386/include/multiboot.h
+++ b/sys/arch/i386/include/multiboot.h
@@ -43,9 +43,12 @@
 #define MULTIBOOT_HEADER_HAS_VBE       0x00000004
 #define MULTIBOOT_HEADER_HAS_ADDR      0x00010000
 
-#if defined(__minix) && !defined(__ASSEMBLY__)
+#if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))
 
 #if !defined(_LOCORE)
+
+#include <machine/types.h>
+
 struct multiboot_header {
        uint32_t        mh_magic;
        uint32_t        mh_flags;
@@ -73,7 +76,7 @@ struct multiboot_header {
 extern struct multiboot_header *Multiboot_Header;
 #endif /* !defined(_LOCORE) && defined(_KERNEL) */
 
-#endif /* defined(__minix) && !defined(__ASSEMBLY__) */
+#endif /* defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))*/
 
 /* --------------------------------------------------------------------- */
 
@@ -94,7 +97,7 @@ extern struct multiboot_header *Multiboot_Header;
 #define MULTIBOOT_INFO_HAS_APM_TABLE   0x00000400
 #define MULTIBOOT_INFO_HAS_VBE         0x00000800
 
-#if defined(__minix) && !defined(__ASSEMBLY__)
+#if defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))
 
 #if !defined(_LOCORE)
 struct multiboot_info {
@@ -197,7 +200,7 @@ struct multiboot_module {
 
 #endif /* !defined(_LOCORE) */
 
-#endif /* defined(__minix) && !defined(__ASSEMBLY__) */
+#endif /* defined(__minix) && !defined(__ASSEMBLY__) && (defined(_MINIX_SYSTEM) || defined(_STANDALONE))*/
 
 #if defined(__minix)
 
@@ -240,4 +243,4 @@ bool                multiboot_ksyms_addsyms_elf(void);
 
 /* --------------------------------------------------------------------- */
 
-#endif /* _MACHINE_MULTIBOOT_H */
\ No newline at end of file
+#endif /* _MACHINE_MULTIBOOT_H */

diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index c28f40eb55affbc12f59b2490f354cf248ffdfd0..19df99d08d00f48460f19a517be33cfa6f0afad6 100644 (file)
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -200,14 +200,14 @@ void *    mremap(void *, size_t, void *, size_t, int);
 #endif
 int    posix_madvise(void *, size_t, int);
 
-#if defined(__minix)
+#if defined(__minix) && defined(_MINIX_SYSTEM)
 #include <minix/endpoint.h>
 void *         vm_remap(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
 void *         vm_remap_ro(endpoint_t d, endpoint_t s, void *da, void *sa, size_t si);
 int            vm_unmap(endpoint_t endpt, void *addr);
 unsigned long  vm_getphys(endpoint_t endpt, void *addr);
 u8_t           vm_getrefcount(endpoint_t endpt, void *addr);
-#endif /* defined(__minix) */
+#endif /* defined(__minix) && defined(_MINIX_SYSTEM) */
 
 __END_DECLS
 

diff --git a/test/test39.c b/test/test39.c
index 0ec2931c35145eefb32b15bd402a5329e895241e..c1f4cb0330e822e3d05e11c0efd27d522a61075f 100644 (file)
--- a/test/test39.c
+++ b/test/test39.c
@@ -1,4 +1,6 @@
 
+#define _MINIX_SYSTEM
+
 #include <stdio.h>
 #include <minix/endpoint.h>
 #include <minix/sys_config.h>

diff --git a/test/test72.c b/test/test72.c
index ca33e5ada6d9a128cc6608e5da1ec5344370e135..2b4b2ae9be3cb1cc559dc25a45c48523319f2292 100644 (file)
--- a/test/test72.c
+++ b/test/test72.c
@@ -3,6 +3,8 @@
  * Exercise the caching functionality of libminixfs in isolation.
  */
 
+#define _MINIX_SYSTEM
+
 #include <minix/libminixfs.h>
 #include <minix/sysutil.h>
 #include <minix/syslib.h>

diff --git a/test/test73.c b/test/test73.c
index 3c5c7f4b114b408352e432a868f28eaa431b6817..c16e29c41f6072613874238715e3357034f76e09 100644 (file)
--- a/test/test73.c
+++ b/test/test73.c
@@ -4,6 +4,8 @@
  * in testvm.c, started as a service by this test program.
  */
 
+#define _MINIX_SYSTEM 1
+
 #include <minix/libminixfs.h>
 #include <minix/sysutil.h>
 #include <minix/syslib.h>

diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index 637f1abe353e4ed4f3ad5f28ec78c5a701b02c05..cafa384ab0380a5f339c76b7ff9652e6c19e6fb3 100644 (file)
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -2,6 +2,8 @@
 /* Author: Ben Gras <beng@few.vu.nl>  17 march 2006 */
 /* Modified for ProcFS by Alen Stojanov and David van Moolenbroek */
 
+#define _MINIX_SYSTEM 1
+
 #include <stdio.h>
 #include <unistd.h>
 #include <pwd.h>