diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-03-11 14:15:29 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-03-11 14:15:29 +0000 |
| commit | 3197cbe3694b324cd1b3431df34cc2b5d471ff68 (patch) | |
| tree | f46c86e3d9e9cadd6279464fa7181bd10f491949 /cmake | |
| parent | e70f19d48fda463566ef315ab29e7e606b843e9f (diff) | |
| parent | a7bf808cca79a95631e3c82223a0bc8982c94d94 (diff) | |
| download | dbus-3197cbe3694b324cd1b3431df34cc2b5d471ff68.tar.gz | |
Merge branch 'non-posix-getwpnam-r' into 'master'
Remove support for non-POSIX getpwnam_r()
See merge request dbus/dbus!11
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 27cd986d..3a1165f0 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -46,7 +46,7 @@ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) # check_symbol_exists(getgrouplist "grp.h" HAVE_GETGROUPLIST) # dbus-sysdeps.c check_symbol_exists(getpeerucred "ucred.h" HAVE_GETPEERUCRED) # dbus-sysdeps.c, dbus-sysdeps-win.c check_symbol_exists(nanosleep "time.h" HAVE_NANOSLEEP) # dbus-sysdeps.c -check_symbol_exists(getpwnam_r "errno.h;pwd.h" HAVE_POSIX_GETPWNAM_R) # dbus-sysdeps-util-unix.c +check_symbol_exists(getpwnam_r "errno.h;pwd.h" HAVE_GETPWNAM_R) # dbus-sysdeps-util-unix.c check_symbol_exists(setenv "stdlib.h" HAVE_SETENV) # dbus-sysdeps.c check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV) # dbus-sysdeps.c check_symbol_exists(clearenv "stdlib.h" HAVE_CLEARENV) # dbus-sysdeps.c diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 881dfa14..2f9f5413 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -13,6 +13,16 @@ * should be placed in this file */ +/* Opt-in to modern APIs and thread-safety for Solaris. In the Autotools + * build system we do the equivalent of this by appending to CFLAGS + * in configure.ac */ +#ifdef __sun +# define __EXTENSIONS__ +# define _POSIX_PTHREAD_SEMANTICS +# define _REENTRANT +# define _XOPEN_SOURCE 500 +#endif + #cmakedefine DBUS_CONSOLE_AUTH_DIR "@DBUS_CONSOLE_AUTH_DIR@" #cmakedefine DBUS_DATADIR "@DBUS_DATADIR@" #cmakedefine DBUS_BINDIR "@DBUS_BINDIR@" @@ -164,7 +174,7 @@ #cmakedefine HAVE_NANOSLEEP 1 /* Define to 1 if you have getpwnam_r */ -#cmakedefine HAVE_POSIX_GETPWNAM_R 1 +#cmakedefine HAVE_GETPWNAM_R 1 /* Define to 1 if you have socketpair */ #cmakedefine HAVE_SOCKETPAIR 1 |