summaryrefslogtreecommitdiff
path: root/src/system.h
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2011-01-13 09:36:38 +0000
committerPádraig Brady <P@draigBrady.com>2011-01-13 17:28:36 +0000
commite1aaf8903db97f3240b1551fd6936ccdc652dfc8 (patch)
tree1c63e41e5ba1f7a0d77607933769dd47df86443e /src/system.h
parentd95e3c8cebb98ea26a99a64c6bb1ad1024c38662 (diff)
downloadcoreutils-e1aaf8903db97f3240b1551fd6936ccdc652dfc8.tar.gz
maint: trivial system header file cleanups
* src/system.h: Note where it should be included, and make ordering check portable to GLIBC > 2 * src/copy.c: Move <sys/ioctl.h> along with other system headers as is done elsewhere. * src/install.c: Move <sys/wait.h> along with other system headers as is done elsewhere. * src/ptx.c: Include <regex.h> rather than "regex.h" as is done elsewhere. Note <regex.h> is kept after "system.h" as per commit dba300a0.
Diffstat (limited to 'src/system.h')
-rw-r--r--src/system.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/system.h b/src/system.h
index 3b32cbd6c..b86e57047 100644
--- a/src/system.h
+++ b/src/system.h
@@ -14,11 +14,15 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* Include this file _after_ system headers if possible. */
+
#include <alloca.h>
-/* Include sys/types.h before this file. */
+/* Include <sys/types.h> before this file.
+ Note this doesn't warn if we're included
+ before all system headers. */
-#if 2 <= __GLIBC__ && 2 <= __GLIBC_MINOR__
+#if 2 < __GLIBC__ || ( 2 == ___GLIBC__ && 2 <= __GLIBC_MINOR__ )
# if ! defined _SYS_TYPES_H
you must include <sys/types.h> before including this file
# endif