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=63682
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>

diff --git a/bus/session.conf.in b/bus/session.conf.in
index bb6f70b..74d9d1f 100644 (file)
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -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>  

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index c7f9939..45d7fb8 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -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.

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 3c7cb96..91cf080 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -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; }
 

diff --git a/configure.ac b/configure.ac
index c55ced7..21df950 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"