More FreeBSDish places.
mirabilos
7 years ago
| 0 | 0 | From: Thorsten Glaser <tg@mirbsd.org> |
| 1 | Subject: Recognise GNU/kFreeBSD as FreeBSD variant for NASM | |
| 1 | Subject: Recognise GNU/kFreeBSD as FreeBSD variant | |
| 2 | 2 | |
| 3 | --- a/common/os_calls.c | |
| 4 | +++ b/common/os_calls.c | |
| 5 | @@ -87,8 +87,8 @@ extern char **environ; | |
| 6 | #endif | |
| 7 | ||
| 8 | /* sys/ucred.h needs to be included to use struct xucred | |
| 9 | - * in FreeBSD and OS X. No need for other BSDs */ | |
| 10 | -#if defined(__FreeBSD__) || defined(__APPLE__) | |
| 11 | + * in FreeBSD and OS X. No need for other BSDs except GNU/kFreeBSD */ | |
| 12 | +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) | |
| 13 | #include <sys/ucred.h> | |
| 14 | #endif | |
| 15 | ||
| 3 | 16 | --- a/librfxcodec/acinclude.m4 |
| 4 | 17 | +++ b/librfxcodec/acinclude.m4 |
| 5 | 18 | @@ -40,7 +40,7 @@ case "$host_os" in |
| 11 | 24 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
| 12 | 25 | objfmt='BSD-a.out' |
| 13 | 26 | else |
| 27 | --- a/sesman/session.c | |
| 28 | +++ b/sesman/session.c | |
| 29 | @@ -503,7 +503,7 @@ session_start_fork(tbus data, tui8 type, | |
| 30 | g_sprintf(geometry, "%dx%d", s->width, s->height); | |
| 31 | g_sprintf(depth, "%d", s->bpp); | |
| 32 | g_sprintf(screen, ":%d", display); | |
| 33 | -#ifdef __FreeBSD__ | |
| 34 | +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) | |
| 35 | /* | |
| 36 | * FreeBSD bug | |
| 37 | * ports/157282: effective login name is not set by xrdp-sesman | |
| 14 | 38 | --- a/xorgxrdp/acinclude.m4 |
| 15 | 39 | +++ b/xorgxrdp/acinclude.m4 |
| 16 | 40 | @@ -40,7 +40,7 @@ case "$host_os" in |