summaryrefslogtreecommitdiff
path: root/cmake/config.h.cmake
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2020-03-11 14:15:29 +0000
committerSimon McVittie <smcv@collabora.com>2020-03-11 14:15:29 +0000
commit3197cbe3694b324cd1b3431df34cc2b5d471ff68 (patch)
treef46c86e3d9e9cadd6279464fa7181bd10f491949 /cmake/config.h.cmake
parente70f19d48fda463566ef315ab29e7e606b843e9f (diff)
parenta7bf808cca79a95631e3c82223a0bc8982c94d94 (diff)
downloaddbus-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/config.h.cmake')
-rw-r--r--cmake/config.h.cmake12
1 files changed, 11 insertions, 1 deletions
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