Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Hopefully the last of Linux's ioctl enums. #340

Merged
merged 12 commits into from

7 participants

@alexrp
Collaborator

After much internal bleeding, here is (hopefully) the complete set of ioctl enums for Linux. Also some supplemental changes.

(More OSs to follow...)

@quickfur

Somebody please merge this, this is causing compile errors for any code that uses these modules.

src/core/sys/posix/termios.d
@@ -135,7 +135,7 @@ version( linux )
alias uint speed_t;
alias uint tcflag_t;
- enum NCCS = 32;
+ enum NCCS = 19;
@klickverbot Collaborator

On my Arch box (glibc 2.16.0), /usr/include/bits/termios.h, which is included by /usr/include/termios.h, has #define NCCS 32. In asm-generic/termios.h, it is 19, though?

@alexrp Collaborator
alexrp added a note

From what I gathered back when I poked around with this, the NCCS value in the glibc termios.h file is just a generic/portable value, while the NCCS value in termbits.h is the actual value Linux uses.

I could be wrong though.

@MartinNowak Collaborator

There is a translation layerin glibc which uses 32, please fix.

@alexrp Collaborator
alexrp added a note

I'm confused. That link says 19?

@MartinNowak Collaborator

Yep, because it's __KERNEL_NCCS, here is the linux definition. They actually copy the data before calling ioctl, see here.

@alexrp Collaborator
alexrp added a note

So 32 is the user-facing definition, is what you're saying?

@MartinNowak Collaborator

Yes

@alexrp Collaborator
alexrp added a note

Fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@WalterBright
Owner

Can't pull it until it can be merged and the test suite passes.

@alexrp
Collaborator

Test suite passes but the makefiles have changed since. Will rebase soon.

@alexrp
Collaborator

Rebased.

@andralex andralex merged commit 2783bf6 into D-Programming-Language:master

1 check failed

Details default Pass: 8, Pending: 2
@andralex
Owner

merged - thanks!

@ariovistus

At least on Ubuntu 12.04 i686, c_ispeed and c_ospeed are fields in termios. What distro were these changes made for?

Collaborator

Can you please open a pull request to fix this?
Here is the correct definition in glibc.

it seems termios and termios2 as described in this changeset are kernel-level structures defined in /usr/include/asm-generic/termbits.h, so I guess that's where this changeset came from.

@ghost Unknown referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@ghost Unknown referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@ghost Unknown referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@ghost Unknown referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
18 posix.mak
@@ -111,15 +111,18 @@ MANIFEST= \
\
src/core/sys/freebsd/dlfcn.d \
src/core/sys/freebsd/execinfo.d \
+ \
src/core/sys/freebsd/sys/event.d \
\
src/core/sys/linux/execinfo.d \
src/core/sys/linux/epoll.d \
+ \
src/core/sys/linux/sys/signalfd.d \
src/core/sys/linux/sys/xattr.d \
\
src/core/sys/osx/execinfo.d \
src/core/sys/osx/pthread.d \
+ \
src/core/sys/osx/mach/dyld.d \
src/core/sys/osx/mach/getsect.d \
src/core/sys/osx/mach/kern_return.d \
@@ -133,7 +136,6 @@ MANIFEST= \
src/core/sys/posix/dlfcn.d \
src/core/sys/posix/fcntl.d \
src/core/sys/posix/inttypes.d \
- src/core/sys/posix/net/if_.d \
src/core/sys/posix/netdb.d \
src/core/sys/posix/poll.d \
src/core/sys/posix/pthread.d \
@@ -152,6 +154,8 @@ MANIFEST= \
\
src/core/sys/posix/arpa/inet.d \
\
+ src/core/sys/posix/net/if_.d \
+ \
src/core/sys/posix/netinet/in_.d \
src/core/sys/posix/netinet/tcp.d \
\
@@ -167,8 +171,8 @@ MANIFEST= \
src/core/sys/posix/sys/types.d \
src/core/sys/posix/sys/uio.d \
src/core/sys/posix/sys/un.d \
- src/core/sys/posix/sys/wait.d \
src/core/sys/posix/sys/utsname.d \
+ src/core/sys/posix/sys/wait.d \
\
src/core/sys/windows/dbghelp.d \
src/core/sys/windows/dll.d \
@@ -200,7 +204,6 @@ MANIFEST= \
src/rt/arrayshort.d \
src/rt/cast_.d \
src/rt/cmath2.d \
- src/rt/compiler.d \
src/rt/complex.c \
src/rt/cover.d \
src/rt/critical_.d \
@@ -313,6 +316,7 @@ SRC_D_MODULES = \
core/sys/posix/sys/stat \
core/sys/posix/sys/wait \
core/sys/posix/netdb \
+ core/sys/posix/sys/ioctl \
core/sys/posix/sys/utsname \
core/sys/posix/netinet/in_ \
\
@@ -550,13 +554,13 @@ SRCS=$(addprefix src/,$(addsuffix .d,$(SRC_D_MODULES)))
COPYDIRS=\
$(IMPDIR)/core/stdc \
- $(IMPDIR)/core/sys/windows \
+ $(IMPDIR)/core/sys/freebsd/sys \
+ $(IMPDIR)/core/sys/osx/mach \
$(IMPDIR)/core/sys/posix/arpa \
- $(IMPDIR)/core/sys/posix/sys \
$(IMPDIR)/core/sys/posix/net \
$(IMPDIR)/core/sys/posix/netinet \
- $(IMPDIR)/core/sys/osx/mach \
- $(IMPDIR)/core/sys/freebsd/sys \
+ $(IMPDIR)/core/sys/posix/sys \
+ $(IMPDIR)/core/sys/windows \
######################## Doc .html file generation ##############################
View
8 src/core/sys/posix/fcntl.d
@@ -112,10 +112,10 @@ version( linux )
enum O_DSYNC = O_SYNC;
enum O_RSYNC = O_SYNC;
- enum O_ACCMODE = 0003;
- enum O_RDONLY = 00;
- enum O_WRONLY = 01;
- enum O_RDWR = 02;
+ enum O_ACCMODE = 0x3;
+ enum O_RDONLY = 0x0;
+ enum O_WRONLY = 0x1;
+ enum O_RDWR = 0x2;
struct flock
{
View
131 src/core/sys/posix/sys/ioctl.d
@@ -24,26 +24,82 @@ nothrow:
version (linux)
{
- struct winsize
+ import core.sys.posix.termios; // termios2
+ public import core.sys.posix.termios : termio, winsize;
+
+ enum _IOC_NRBITS = 8;
+ enum _IOC_TYPEBITS = 8;
+ enum _IOC_SIZEBITS = 14;
+ enum _IOC_DIRBITS = 2;
+
+ enum _IOC_NRMASK = (1 << _IOC_NRBITS) - 1;
+ enum _IOC_TYPEMASK = (1 << _IOC_TYPEBITS) - 1;
+ enum _IOC_SIZEMASK = (1 << _IOC_SIZEBITS) - 1;
+ enum _IOC_DIRMASK = (1 << _IOC_DIRBITS) - 1;
+
+ enum _IOC_NRSHIFT = 0;
+ enum _IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS;
+ enum _IOC_SIZESHIFT = _IOC_TYPESHIFT + _IOC_TYPEBITS;
+ enum _IOC_DIRSHIFT = _IOC_SIZESHIFT + _IOC_SIZEBITS;
+
+ enum _IOC_NONE = 0;
+ enum _IOC_WRITE = 1;
+ enum _IOC_READ = 2;
+
+ extern (D) int _IOC(T = typeof(null))(int dir, int type, int nr)
{
- ushort ws_row;
- ushort ws_col;
- ushort ws_xpixel;
- ushort ws_ypixel;
+ return (dir << _IOC_DIRSHIFT) |
+ (type << _IOC_TYPESHIFT) |
+ (nr << _IOC_NRSHIFT) |
+ (is(T == typeof(null)) ? 0 : T.sizeof << _IOC_SIZESHIFT);
+ }
+
+ extern (D) int _IO(int type, int nr)
+ {
+ return _IOC(_IOC_NONE, type, nr);
+ }
+
+ extern (D) int _IOR(T)(int type, int nr)
+ {
+ return _IOC!T(_IOC_READ, type, nr);
+ }
+
+ extern (D) int _IOW(T)(int type, int nr)
+ {
+ return _IOC!T(_IOC_WRITE, type, nr);
+ }
+
+ extern (D) int _IOWR(T)(int type, int nr)
+ {
+ return _IOC!T(_IOC_READ | _IOC_WRITE, type, nr);
+ }
+
+ extern (D) int _IOC_DIR(int nr)
+ {
+ return (nr >> _IOC_DIRSHIFT) & _IOC_DIRMASK;
+ }
+
+ extern (D) int _IOC_TYPE(int nr)
+ {
+ return (nr >> _IOC_TYPESHIFT) & _IOC_TYPEMASK;
}
- enum NCC = 8;
+ extern (D) int _IOC_NR(int nr)
+ {
+ return (nr >> _IOC_NRSHIFT) & _IOC_NRMASK;
+ }
- struct termio
+ extern (D) int _IOC_SIZE(int nr)
{
- ushort c_iflag;
- ushort c_oflag;
- ushort c_cflag;
- ushort c_lflag;
- ubyte c_line;
- ubyte[NCC] c_cc;
+ return (nr >> _IOC_SIZESHIFT) & _IOC_SIZEMASK;
}
+ enum IOC_IN = _IOC_WRITE << _IOC_DIRSHIFT;
+ enum IOC_OUT = _IOC_READ << _IOC_DIRSHIFT;
+ enum IOC_INOUT = (_IOC_READ | _IOC_WRITE) << _IOC_DIRSHIFT;
+ enum IOCSIZE_MASK = _IOC_SIZEMASK << _IOC_DIRSHIFT;
+ enum IOCSIZE_SHIFT = _IOC_SIZESHIFT;
+
enum TIOCM_LE = 0x001;
enum TIOCM_DTR = 0x002;
enum TIOCM_RTS = 0x004;
@@ -115,24 +171,24 @@ version (linux)
enum TIOCCBRK = 0x5428;
enum TIOCGSID = 0x5429;
- //enum TCGETS2 _IOR('T', 0x2A, struct termios2)
- //enum TCSETS2 _IOW('T', 0x2B, struct termios2)
- //enum TCSETSW2 _IOW('T', 0x2C, struct termios2)
- //enum TCSETSF2 _IOW('T', 0x2D, struct termios2)
+ enum TCGETS2 = _IOR!termios2('T', 0x2A);
+ enum TCSETS2 = _IOR!termios2('T', 0x2B);
+ enum TCSETSW2 = _IOW!termios2('T', 0x2C);
+ enum TCSETSF2 = _IOW!termios2('T', 0x2D);
enum TIOCGRS485 = 0x542E;
enum TIOCSRS485 = 0x542F;
- //enum TIOCGPTN _IOR('T', 0x30, unsigned int)
- //enum TIOCSPTLCK _IOW('T', 0x31, int)
- //enum TIOCGDEV _IOR('T', 0x32, unsigned int)
+ enum TIOCGPTN = _IOR!uint('T', 0x30);
+ enum TIOCSPTLCK = _IOW!int('T', 0x31);
+ enum TIOCGDEV = _IOR!uint('T', 0x32);
enum TCGETX = 0x5432;
enum TCSETX = 0x5433;
enum TCSETXF = 0x5434;
enum TCSETXW = 0x5435;
- //enum TIOCSIG _IOW('T', 0x36, int)
+ enum TIOCSIG = _IOW!int('T', 0x36);
enum TIOCVHANGUP = 0x5437;
@@ -233,10 +289,43 @@ version (linux)
}
else version (OSX)
{
+ import core.sys.posix.termios; // termios
+ import core.sys.posix.sys.time; // timeval
+
+ struct winsize
+ {
+ ushort ws_row;
+ ushort ws_col;
+ ushort ws_xpixel;
+ ushort ws_ypixel;
+ }
+
+ struct ttysize
+ {
+ ushort ts_lines;
+ ushort ts_cols;
+ ushort ts_xxx;
+ ushort ts_yyy;
+ }
+
int ioctl(int fildes, c_ulong request, ...);
}
else version (FreeBSD)
{
+ struct fiodgname_arg
+ {
+ int len;
+ void* buf;
+ }
+
+ struct winsize
+ {
+ ushort ws_row;
+ ushort ws_col;
+ ushort ws_xpixel;
+ ushort ws_ypixel;
+ }
+
int ioctl(int, c_ulong, ...);
}
else version (Solaris)
View
12 src/core/sys/posix/sys/ipc.d
@@ -63,9 +63,9 @@ version( linux )
c_ulong __unused2;
}
- enum IPC_CREAT = 01000;
- enum IPC_EXCL = 02000;
- enum IPC_NOWAIT = 04000;
+ enum IPC_CREAT = 0x0200; // 01000
+ enum IPC_EXCL = 0x0400; // 02000
+ enum IPC_NOWAIT = 0x0800; // 04000
enum key_t IPC_PRIVATE = 0;
@@ -103,9 +103,9 @@ else version( FreeBSD )
key_t key;
}
- enum IPC_CREAT = 01000;
- enum IPC_EXCL = 02000;
- enum IPC_NOWAIT = 04000;
+ enum IPC_CREAT = 0x0200; // 01000
+ enum IPC_EXCL = 0x0400; // 02000
+ enum IPC_NOWAIT = 0x0800; // 04000
enum key_t IPC_PRIVATE = 0;
View
8 src/core/sys/posix/sys/shm.d
@@ -52,8 +52,8 @@ int shmget(key_t, size_t, int);
version( linux )
{
- enum SHM_RDONLY = 010000;
- enum SHM_RND = 020000;
+ enum SHM_RDONLY = 0x01000; // 010000
+ enum SHM_RND = 0x02000; // 020000
int __getpagesize();
alias __getpagesize SHMLBA;
@@ -84,8 +84,8 @@ version( linux )
}
else version( FreeBSD )
{
- enum SHM_RDONLY = 010000;
- enum SHM_RND = 020000;
+ enum SHM_RDONLY = 0x01000; // 010000
+ enum SHM_RND = 0x02000; // 020000
enum SHMLBA = 1 << 12; // PAGE_SIZE = (1<<PAGE_SHIFT)
alias c_ulong shmatt_t;
View
16 src/core/sys/posix/sys/stat.d
@@ -313,10 +313,10 @@ else version( FreeBSD )
enum S_IXGRP = 0x008; // octal 0000010
enum S_IRWXG = 0x038; // octal 0000070
- enum S_IROTH = 0000004;
- enum S_IWOTH = 0000002;
- enum S_IXOTH = 0000001;
- enum S_IRWXO = 0000007;
+ enum S_IROTH = 0x4; // 0000004
+ enum S_IWOTH = 0x2; // 0000002
+ enum S_IXOTH = 0x1; // 0000001
+ enum S_IRWXO = 0x7; // 0000007
enum S_ISUID = 0x800; // octal 0004000
enum S_ISGID = 0x400; // octal 0002000
@@ -426,10 +426,10 @@ else version (Solaris)
enum S_IXGRP = 0x008;
enum S_IRWXG = 0x038;
- enum S_IROTH = 0000004;
- enum S_IWOTH = 0000002;
- enum S_IXOTH = 0000001;
- enum S_IRWXO = 0000007;
+ enum S_IROTH = 0x4; // 0000004
+ enum S_IWOTH = 0x2; // 0000002
+ enum S_IXOTH = 0x1; // 0000001
+ enum S_IRWXO = 0x7; // 0000007
enum S_ISUID = 0x800;
enum S_ISGID = 0x400;
View
194 src/core/sys/posix/termios.d
@@ -3,7 +3,7 @@
*
* Copyright: Copyright Sean Kelly 2005 - 2009.
* License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
- * Authors: Sean Kelly
+ * Authors: Sean Kelly, Alex Rønne Petersen
* Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
*/
@@ -145,10 +145,40 @@ version( linux )
tcflag_t c_lflag;
cc_t c_line;
cc_t[NCCS] c_cc;
+ }
+
+ struct termios2
+ {
+ tcflag_t c_iflag;
+ tcflag_t c_oflag;
+ tcflag_t c_cflag;
+ tcflag_t c_lflag;
+ cc_t c_line;
+ cc_t[NCCS] c_cc;
speed_t c_ispeed;
speed_t c_ospeed;
}
+ struct winsize
+ {
+ ushort ws_row;
+ ushort ws_col;
+ ushort ws_xpixel;
+ ushort ws_ypixel;
+ }
+
+ enum NCC = 8;
+
+ struct termio
+ {
+ ushort c_iflag;
+ ushort c_oflag;
+ ushort c_cflag;
+ ushort c_lflag;
+ ubyte c_line;
+ ubyte[NCC] c_cc;
+ }
+
enum VEOF = 4;
enum VEOL = 11;
enum VERASE = 2;
@@ -161,58 +191,58 @@ version( linux )
enum VSUSP = 10;
enum VTIME = 5;
- enum BRKINT = 0000002;
- enum ICRNL = 0000400;
- enum IGNBRK = 0000001;
- enum IGNCR = 0000200;
- enum IGNPAR = 0000004;
- enum INLCR = 0000100;
- enum INPCK = 0000020;
- enum ISTRIP = 0000040;
- enum IXOFF = 0010000;
- enum IXON = 0002000;
- enum PARMRK = 0000010;
-
- enum OPOST = 0000001;
-
- enum B0 = 0000000;
- enum B50 = 0000001;
- enum B75 = 0000002;
- enum B110 = 0000003;
- enum B134 = 0000004;
- enum B150 = 0000005;
- enum B200 = 0000006;
- enum B300 = 0000007;
- enum B600 = 0000010;
- enum B1200 = 0000011;
- enum B1800 = 0000012;
- enum B2400 = 0000013;
- enum B4800 = 0000014;
- enum B9600 = 0000015;
- enum B19200 = 0000016;
- enum B38400 = 0000017;
-
- enum CSIZE = 0000060;
- enum CS5 = 0000000;
- enum CS6 = 0000020;
- enum CS7 = 0000040;
- enum CS8 = 0000060;
- enum CSTOPB = 0000100;
- enum CREAD = 0000200;
- enum PARENB = 0000400;
- enum PARODD = 0001000;
- enum HUPCL = 0002000;
- enum CLOCAL = 0004000;
-
- enum ECHO = 0000010;
- enum ECHOE = 0000020;
- enum ECHOK = 0000040;
- enum ECHONL = 0000100;
- enum ICANON = 0000002;
- enum IEXTEN = 0100000;
- enum ISIG = 0000001;
- enum NOFLSH = 0000200;
- enum TOSTOP = 0000400;
+ enum BRKINT = 0x0000002; // 0000002
+ enum ICRNL = 0x0000100; // 0000400
+ enum IGNBRK = 0x0000001; // 0000001
+ enum IGNCR = 0x0000080; // 0000200
+ enum IGNPAR = 0x0000004; // 0000004
+ enum INLCR = 0x0000040; // 0000100
+ enum INPCK = 0x0000010; // 0000020
+ enum ISTRIP = 0x0000020; // 0000040
+ enum IXOFF = 0x0001000; // 0010000
+ enum IXON = 0x0000400; // 0002000
+ enum PARMRK = 0x0000008; // 0000010
+
+ enum OPOST = 0x0000001; // 0000001
+
+ enum B0 = 0x0000000; // 0000000
+ enum B50 = 0x0000001; // 0000001
+ enum B75 = 0x0000002; // 0000002
+ enum B110 = 0x0000003; // 0000003
+ enum B134 = 0x0000004; // 0000004
+ enum B150 = 0x0000005; // 0000005
+ enum B200 = 0x0000006; // 0000006
+ enum B300 = 0x0000007; // 0000007
+ enum B600 = 0x0000008; // 0000010
+ enum B1200 = 0x0000009; // 0000011
+ enum B1800 = 0x000000A; // 0000012
+ enum B2400 = 0x000000B; // 0000013
+ enum B4800 = 0x000000C; // 0000014
+ enum B9600 = 0x000000D; // 0000015
+ enum B19200 = 0x000000E; // 0000016
+ enum B38400 = 0x000000F; // 0000017
+
+ enum CSIZE = 0x0000030; // 0000060
+ enum CS5 = 0x0000000; // 0000000
+ enum CS6 = 0x0000010; // 0000020
+ enum CS7 = 0x0000020; // 0000040
+ enum CS8 = 0x0000030; // 0000060
+ enum CSTOPB = 0x0000040; // 0000100
+ enum CREAD = 0x0000080; // 0000200
+ enum PARENB = 0x0000100; // 0000400
+ enum PARODD = 0x0000200; // 0001000
+ enum HUPCL = 0x0000400; // 0002000
+ enum CLOCAL = 0x0000800; // 0004000
+
+ enum ECHO = 0x0000008; // 0000010
+ enum ECHOE = 0x0000010; // 0000020
+ enum ECHOK = 0x0000020; // 0000040
+ enum ECHONL = 0x0000040; // 0000100
+ enum ICANON = 0x0000002; // 0000002
+ enum IEXTEN = 0x0008000; // 0100000
+ enum ISIG = 0x0000001; // 0000001
+ enum NOFLSH = 0x0000080; // 0000200
+ enum TOSTOP = 0x0000100; // 0000400
enum TCSANOW = 0;
enum TCSADRAIN = 1;
@@ -496,35 +526,35 @@ pid_t tcgetsid(int);
version( linux )
{
- enum IXANY = 0004000;
-
- enum ONLCR = 0000004;
- enum OCRNL = 0000010;
- enum ONOCR = 0000020;
- enum ONLRET = 0000040;
- enum OFILL = 0000100;
- enum NLDLY = 0000400;
- enum NL0 = 0000000;
- enum NL1 = 0000400;
- enum CRDLY = 0003000;
- enum CR0 = 0000000;
- enum CR1 = 0001000;
- enum CR2 = 0002000;
- enum CR3 = 0003000;
- enum TABDLY = 0014000;
- enum TAB0 = 0000000;
- enum TAB1 = 0004000;
- enum TAB2 = 0010000;
- enum TAB3 = 0014000;
- enum BSDLY = 0020000;
- enum BS0 = 0000000;
- enum BS1 = 0020000;
- enum VTDLY = 0040000;
- enum VT0 = 0000000;
- enum VT1 = 0040000;
- enum FFDLY = 0100000;
- enum FF0 = 0000000;
- enum FF1 = 0100000;
+ enum IXANY = 0x0000800; // 0004000
+
+ enum ONLCR = 0x0000004; // 0000004
+ enum OCRNL = 0x0000008; // 0000010
+ enum ONOCR = 0x0000010; // 0000020
+ enum ONLRET = 0x0000020; // 0000040
+ enum OFILL = 0x0000040; // 0000100
+ enum NLDLY = 0x0000100; // 0000400
+ enum NL0 = 0x0000000; // 0000000
+ enum NL1 = 0x0000100; // 0000400
+ enum CRDLY = 0x0000600; // 0003000
+ enum CR0 = 0x0000000; // 0000000
+ enum CR1 = 0x0000200; // 0001000
+ enum CR2 = 0x0000400; // 0002000
+ enum CR3 = 0x0000600; // 0003000
+ enum TABDLY = 0x0001800; // 0014000
+ enum TAB0 = 0x0000000; // 0000000
+ enum TAB1 = 0x0000800; // 0004000
+ enum TAB2 = 0x0001000; // 0010000
+ enum TAB3 = 0x0001800; // 0014000
+ enum BSDLY = 0x0002000; // 0020000
+ enum BS0 = 0x0000000; // 0000000
+ enum BS1 = 0x0002000; // 0020000
+ enum VTDLY = 0x0004000; // 0040000
+ enum VT0 = 0x0000000; // 0000000
+ enum VT1 = 0x0004000; // 0040000
+ enum FFDLY = 0x0008000; // 0100000
+ enum FF0 = 0x0000000; // 0000000
+ enum FF1 = 0x0008000; // 0100000
pid_t tcgetsid(int);
}
View
20 win32.mak
@@ -80,15 +80,18 @@ MANIFEST= \
\
src\core\sys\freebsd\dlfcn.d \
src\core\sys\freebsd\execinfo.d \
+ \
src\core\sys\freebsd\sys\event.d \
\
src\core\sys\linux\execinfo.d \
src\core\sys\linux\epoll.d \
+ \
src\core\sys\linux\sys\signalfd.d \
src\core\sys\linux\sys\xattr.d \
\
src\core\sys\osx\execinfo.d \
src\core\sys\osx\pthread.d \
+ \
src\core\sys\osx\mach\dyld.d \
src\core\sys\osx\mach\getsect.d \
src\core\sys\osx\mach\kern_return.d \
@@ -102,7 +105,6 @@ MANIFEST= \
src\core\sys\posix\dlfcn.d \
src\core\sys\posix\fcntl.d \
src\core\sys\posix\inttypes.d \
- src\core\sys\posix\net\if_.d \
src\core\sys\posix\netdb.d \
src\core\sys\posix\poll.d \
src\core\sys\posix\pthread.d \
@@ -121,6 +123,8 @@ MANIFEST= \
\
src\core\sys\posix\arpa\inet.d \
\
+ src\core\sys\posix\net\if_.d \
+ \
src\core\sys\posix\netinet\in_.d \
src\core\sys\posix\netinet\tcp.d \
\
@@ -135,8 +139,8 @@ MANIFEST= \
src\core\sys\posix\sys\types.d \
src\core\sys\posix\sys\uio.d \
src\core\sys\posix\sys\un.d \
- src\core\sys\posix\sys\wait.d \
src\core\sys\posix\sys\utsname.d \
+ src\core\sys\posix\sys\wait.d \
\
src\core\sys\windows\dbghelp.d \
src\core\sys\windows\dll.d \
@@ -592,16 +596,16 @@ $(IMPDIR)\core\sync\semaphore.di : src\core\sync\semaphore.d
######################## Header .di file copy ##############################
copydir: $(IMPDIR)
- mkdir $(IMPDIR)\core\sys\windows
+ mkdir $(IMPDIR)\core\stdc
+ mkdir $(IMPDIR)\core\sys\freebsd\sys
+ mkdir $(IMPDIR)\core\sys\linux\sys
+ mkdir $(IMPDIR)\core\sys\osx\mach
mkdir $(IMPDIR)\core\sys\posix\arpa
- mkdir $(IMPDIR)\core\sys\posix\sys
mkdir $(IMPDIR)\core\sys\posix\net
mkdir $(IMPDIR)\core\sys\posix\netinet
- mkdir $(IMPDIR)\core\sys\osx\mach
- mkdir $(IMPDIR)\core\sys\freebsd\sys
- mkdir $(IMPDIR)\core\sys\linux\sys
+ mkdir $(IMPDIR)\core\sys\posix\sys
+ mkdir $(IMPDIR)\core\sys\windows
mkdir $(IMPDIR)\etc\linux
- mkdir $(IMPDIR)\core\stdc
copy: $(COPY)
View
20 win64.mak
@@ -87,15 +87,18 @@ MANIFEST= \
\
src\core\sys\freebsd\dlfcn.d \
src\core\sys\freebsd\execinfo.d \
+ \
src\core\sys\freebsd\sys\event.d \
\
src\core\sys\linux\execinfo.d \
src\core\sys\linux\epoll.d \
+ \
src\core\sys\linux\sys\signalfd.d \
src\core\sys\linux\sys\xattr.d \
\
src\core\sys\osx\execinfo.d \
src\core\sys\osx\pthread.d \
+ \
src\core\sys\osx\mach\dyld.d \
src\core\sys\osx\mach\getsect.d \
src\core\sys\osx\mach\kern_return.d \
@@ -109,7 +112,6 @@ MANIFEST= \
src\core\sys\posix\dlfcn.d \
src\core\sys\posix\fcntl.d \
src\core\sys\posix\inttypes.d \
- src\core\sys\posix\net\if_.d \
src\core\sys\posix\netdb.d \
src\core\sys\posix\poll.d \
src\core\sys\posix\pthread.d \
@@ -128,6 +130,8 @@ MANIFEST= \
\
src\core\sys\posix\arpa\inet.d \
\
+ src\core\sys\posix\net\if_.d \
+ \
src\core\sys\posix\netinet\in_.d \
src\core\sys\posix\netinet\tcp.d \
\
@@ -142,8 +146,8 @@ MANIFEST= \
src\core\sys\posix\sys\types.d \
src\core\sys\posix\sys\uio.d \
src\core\sys\posix\sys\un.d \
- src\core\sys\posix\sys\wait.d \
src\core\sys\posix\sys\utsname.d \
+ src\core\sys\posix\sys\wait.d \
\
src\core\sys\windows\dbghelp.d \
src\core\sys\windows\dll.d \
@@ -601,16 +605,16 @@ $(IMPDIR)\core\sync\semaphore.di : src\core\sync\semaphore.d
######################## Header .di file copy ##############################
copydir: $(IMPDIR)
- mkdir $(IMPDIR)\core\sys\windows
+ mkdir $(IMPDIR)\core\stdc
+ mkdir $(IMPDIR)\core\sys\freebsd\sys
+ mkdir $(IMPDIR)\core\sys\linux\sys
+ mkdir $(IMPDIR)\core\sys\osx\mach
mkdir $(IMPDIR)\core\sys\posix\arpa
- mkdir $(IMPDIR)\core\sys\posix\sys
mkdir $(IMPDIR)\core\sys\posix\net
mkdir $(IMPDIR)\core\sys\posix\netinet
- mkdir $(IMPDIR)\core\sys\osx\mach
- mkdir $(IMPDIR)\core\sys\freebsd\sys
- mkdir $(IMPDIR)\core\sys\linux\sys
+ mkdir $(IMPDIR)\core\sys\posix\sys
+ mkdir $(IMPDIR)\core\sys\windows
mkdir $(IMPDIR)\etc\linux
- mkdir $(IMPDIR)\core\stdc
copy: $(COPY)
Something went wrong with that request. Please try again.