Commit 28724227 authored by Simon McVittie's avatar Simon McVittie

Rename default_message_unix_fds to DEFAULT_MESSAGE_UNIX_FDS

As Ralf pointed out, we usually use upper-case when substituting
variables (apart from "somethingdir", which Autoconf conventionally
makes lower-case for some reason).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63682Signed-off-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent 15029084
......@@ -49,7 +49,7 @@
<limit name="max_outgoing_bytes">1000000000</limit>
<limit name="max_outgoing_unix_fds">250000000</limit>
<limit name="max_message_size">1000000000</limit>
<limit name="max_message_unix_fds">@default_message_unix_fds@</limit>
<limit name="max_message_unix_fds">@DEFAULT_MESSAGE_UNIX_FDS@</limit>
<limit name="service_start_timeout">120000</limit>
<limit name="auth_timeout">240000</limit>
<limit name="max_completed_connections">100000</limit>
......
......@@ -437,7 +437,7 @@ set (DBUS_USER )
# In Autotools this has a different default on QNX, but there seems little
# point in replicating that here; if you're on an unusual Unix, use Autotools.
set (default_message_unix_fds 1024)
set (DEFAULT_MESSAGE_UNIX_FDS 1024)
# This won't work on Windows. It's not meant to - the system bus is
# meaningless on Windows anyway.
......
......@@ -82,7 +82,7 @@
# define DBUS_ENABLE_X11_AUTOLAUNCH 1
#endif
#define DBUS_DEFAULT_MESSAGE_UNIX_FDS @default_message_unix_fds@
#define DBUS_DEFAULT_MESSAGE_UNIX_FDS @DEFAULT_MESSAGE_UNIX_FDS@
#define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; }
......
......@@ -1299,13 +1299,13 @@ fi
# Determine maximum number of Unix fds which may be passed
AS_CASE([$host_os],
[*qnx*],
[default_message_unix_fds=256],
[DEFAULT_MESSAGE_UNIX_FDS=256],
[*],
[default_message_unix_fds=1024])
[DEFAULT_MESSAGE_UNIX_FDS=1024])
AC_DEFINE_UNQUOTED([DBUS_DEFAULT_MESSAGE_UNIX_FDS],
[$default_message_unix_fds],
[$DEFAULT_MESSAGE_UNIX_FDS],
[Default for dbus_connection_get_max_message_unix_fds()])
AC_SUBST([default_message_unix_fds])
AC_SUBST([DEFAULT_MESSAGE_UNIX_FDS])
#### Set up final flags
LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment