Mercurial > hg > toybox
diff toys.h @ 1235:63db77909fc8 draft
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Sat, 29 Mar 2014 18:11:00 -0500 |
| parents | 4654f241ccbe |
| children | b13728c24a58 |
line wrap: on
line diff
--- a/toys.h Sat Mar 29 15:25:23 2014 -0500 +++ b/toys.h Sat Mar 29 18:11:00 2014 -0500 @@ -3,10 +3,12 @@ * Copyright 2006 Rob Landley <rob@landley.net> */ +// Stuff that needs to go before the standard headers + #include "generated/config.h" - #include "lib/portability.h" +// General posix-2008 headers #include <ctype.h> #include <dirent.h> #include <errno.h> @@ -16,12 +18,10 @@ #include <limits.h> #include <libgen.h> #include <math.h> -#include <pty.h> #include <pwd.h> +#include <regex.h> #include <sched.h> #include <setjmp.h> -#include <sched.h> -#include <shadow.h> #include <stdarg.h> #include <stddef.h> #include <stdint.h> @@ -29,15 +29,10 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#include <sys/ioctl.h> #include <sys/mman.h> -#include <sys/mount.h> #include <sys/resource.h> #include <sys/stat.h> -#include <sys/statfs.h> #include <sys/statvfs.h> -#include <sys/sysinfo.h> -#include <sys/swap.h> #include <sys/time.h> #include <sys/times.h> #include <sys/types.h> @@ -49,13 +44,7 @@ #include <utime.h> #include <utmpx.h> -// Internationalization support - -#include <locale.h> -#include <wchar.h> -#include <wctype.h> - -// Networking stuff +// Posix networking #include <arpa/inet.h> #include <netdb.h> @@ -66,6 +55,18 @@ #include <sys/socket.h> #include <sys/un.h> +// Internationalization support (also in POSIX and LSB) + +#include <locale.h> +#include <wchar.h> +#include <wctype.h> + +// LSB 4.1 headers +#include <pty.h> +#include <sys/ioctl.h> +#include <sys/statfs.h> +#include <sys/sysinfo.h> + #include "lib/lib.h" #include "toys/e2fs.h"