diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-15 13:22:00 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-15 13:22:00 +0000 |
| commit | a062971fb96ae7154d88ab408f899f56aaf6df6b (patch) | |
| tree | 9907dea0824c38373ef2913fd84385ed07a56c3a /usr/src/uts/common/sys/stream.h | |
| parent | 0b570b3cb1c0bf505f1b1bd352664d638b8cc359 (diff) | |
| parent | b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e (diff) | |
| download | illumos-joyent-a062971fb96ae7154d88ab408f899f56aaf6df6b.tar.gz | |
[illumos-gate merge]
commit b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e
10483 aac: cast between incompatible function types
commit a00b240dc61ea7ab64e3881b755fca973a531e89
10146 core_pcbe_event_coverage() is missing an else
commit 542a7b7f5ccc44e3c95d6dce4ec0566f60bd9ff4
7780 mdb could extract NT_PRPSINFO information from core files
commit 2f7dba3e6747cbaaf1deb86e6ca1e2a5c96332ac
10524 wsdiff much slower after move from deprecated commands module
10448 wsdiff explodes on encoding error
10525 wsdiff output is not correct for a binary file
10526 wsdiff tries to spawn 4.8 threads
commit adee678425979226b2b55d1a0b39ce4c989382e9
9735 Need to provide SMB 2.1 Client
commit 40c0e2317898b8c774791bdc2b30bd50111ab1fa
9875 SMB client connection setup rework
commit 8329232e00f1048795bae53acb230316243aadb5
9874 Add fksmbcl development tool
Conflicts:
usr/src/cmd/mdb/common/modules/libc/libc.c
Diffstat (limited to 'usr/src/uts/common/sys/stream.h')
| -rw-r--r-- | usr/src/uts/common/sys/stream.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/sys/stream.h b/usr/src/uts/common/sys/stream.h index efcd2a9194..7488d3dee8 100644 --- a/usr/src/uts/common/sys/stream.h +++ b/usr/src/uts/common/sys/stream.h @@ -36,7 +36,7 @@ * For source compatibility */ #include <sys/isa_defs.h> -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_FAKE_KERNEL) #include <sys/kmem.h> #include <sys/uio.h> #endif @@ -641,7 +641,7 @@ struct stroptions { #define SO_MAXBLK 0x100000 /* set maximum message block size */ #define SO_TAIL 0x200000 /* set the extra allocated space */ -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_FAKE_KERNEL) /* * Structure for rw (read/write) procedure calls. A pointer * to a struiod_t is passed as a parameter to the rwnext() call. @@ -766,7 +766,7 @@ typedef struct cmdblk { */ #define bpsize(bp) ((unsigned int)(bp->b_datap->db_lim - bp->b_datap->db_base)) -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_FAKE_KERNEL) /* * For two-byte M_ERROR messages: indication that a side does not have an error |