Removing include/minix/limits.h

This files defines two constants which are only used through
sys/syslimits. So they where moved there instead of including the file
and it was removed.

Change-Id: Iba3d220144dddf5d6411a6c66e2f223a1aafb50f

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 3930c194505e451a5aae74896a9744362f284e4a..fb09ab01882d0e28744d1d4e1e64b449e89ebeaa 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -638,7 +638,7 @@
 ./usr/include/minix/ipc.h              minix-sys
 ./usr/include/minix/keymap.h           minix-sys
 ./usr/include/minix/libminixfs.h       minix-sys
-./usr/include/minix/limits.h           minix-sys
+./usr/include/minix/limits.h           minix-sys       obsolete
 ./usr/include/minix/log.h              minix-sys
 ./usr/include/minix                    minix-sys
 ./usr/include/minix/minlib.h           minix-sys

diff --git a/include/minix/Makefile b/include/minix/Makefile
index f648464a31ce1f330361ef6599da2eaca34ba571..f52c0ce086b9cd42d993b99ac987740c064c1a85 100644 (file)
--- a/include/minix/Makefile
+++ b/include/minix/Makefile
@@ -12,7 +12,7 @@ INCS+=        acpi.h audio_fw.h bitmap.h \
        driver.h drivers.h drvlib.h ds.h \
        endpoint.h fb.h fslib.h gpio.h gcov.h hash.h \
        hgfs.h ioctl.h input.h ipc.h ipcconst.h \
-       keymap.h limits.h log.h mmio.h mount.h mthread.h minlib.h \
+       keymap.h log.h mmio.h mount.h mthread.h minlib.h \
        netdriver.h optset.h padconf.h partition.h portio.h \
        priv.h procfs.h profile.h queryparam.h \
        reboot.h rs.h safecopies.h sched.h sef.h sffs.h \

diff --git a/include/minix/limits.h b/include/minix/limits.h
deleted file mode 100644 (file)
index ee1012a..0000000
--- a/include/minix/limits.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* The <minix/limits.h> header defines the Minix values for some MINIX
- * constants. Both the MINIX constants and the non-posix constants
- * refer to these underlying definitions.
- */
-
-#ifndef _MINIX_LIMITS_H
-#define _MINIX_LIMITS_H
-
-#define __MINIX_OPEN_MAX    255        /* a process may have 255 files open */
-#define __MINIX_PATH_MAX    1024/* a pathname may contain 1023 chars (+ '\0')*/
-
-#endif /* _MINIX_LIMITS_H */

diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index cf7c8a75931b1f7d7e7d86dcb6c87c946be758d7..e10c4e1c7d3f9726a9e71a2b1210178902cffcfe 100644 (file)
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -34,7 +34,11 @@
 #ifndef _SYS_SYSLIMITS_H_
 #define _SYS_SYSLIMITS_H_
 
-#include <minix/limits.h>
+#if defined(__minix)
+#define __MINIX_OPEN_MAX       255 /* a process may have 255 files open */
+#define __MINIX_PATH_MAX       1024/* a pathname may contain 1023 chars (+ '\0')*/
+#endif /* defined(__minix) */
+
 #include <sys/featuretest.h>
 
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \