components/library/dbus/patches/10-inline.patch

   1 Without the following patches illumos-gate build fail with errors like this:
   2 In file included from /usr/include/dbus-1.0/dbus/dbus.h:30,
   3                  from ../common/libhal.c:35:
   4 /usr/include/dbus-1.0/dbus/dbus-address.h:74:14: error: expected ';' before 'void'
   5    74 | static inline void
   6       |              ^~~~~
   7       |              ;
   8
   9 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-address.h a/dbus/dbus-address.h
  10 --- a~/dbus/dbus-address.h      1970-01-01 00:00:00
  11 +++ a/dbus/dbus-address.h       1970-01-01 00:00:00
  12 @@ -71,12 +71,9 @@ char* dbus_address_unescape_value (const
  13   * pointer_to_entries must not be #NULL, but *pointer_to_entries
  14   * may be #NULL.
  15   */
  16 -static inline void
  17 -dbus_clear_address_entries (DBusAddressEntry ***pointer_to_entries)
  18 -{
  19 -  _dbus_clear_pointer_impl (DBusAddressEntry *, pointer_to_entries,
  20 -                            dbus_address_entries_free);
  21 -}
  22 +#define dbus_clear_address_entries(pointer) \
  23 +       _dbus_clear_pointer_impl(DBusAddressEntry *, \
  24 +       (pointer), dbus_address_entries_free)
  25
  26  /** @} */
  27
  28 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-connection.h a/dbus/dbus-connection.h
  29 --- a~/dbus/dbus-connection.h   1970-01-01 00:00:00
  30 +++ a/dbus/dbus-connection.h    1970-01-01 00:00:00
  31 @@ -461,12 +461,9 @@ dbus_bool_t dbus_connection_get_socket
  32   * pointer_to_connection must not be #NULL, but *pointer_to_connection
  33   * may be #NULL.
  34   */
  35 -static inline void
  36 -dbus_clear_connection (DBusConnection **pointer_to_connection)
  37 -{
  38 -  _dbus_clear_pointer_impl (DBusConnection, pointer_to_connection,
  39 -                            dbus_connection_unref);
  40 -}
  41 +#define dbus_clear_connection(pointer) \
  42 +       _dbus_clear_pointer_impl(DBusConnection, \
  43 +       (pointer), dbus_connection_unref)
  44
  45  /** @} */
  46
  47 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-message.h a/dbus/dbus-message.h
  48 --- a~/dbus/dbus-message.h      1970-01-01 00:00:00
  49 +++ a/dbus/dbus-message.h       1970-01-01 00:00:00
  50 @@ -369,12 +369,8 @@ dbus_bool_t dbus_message_get_allow_inter
  51   * pointer_to_message must not be #NULL, but *pointer_to_message
  52   * may be #NULL.
  53   */
  54 -static inline void
  55 -dbus_clear_message (DBusMessage **pointer_to_message)
  56 -{
  57 -  _dbus_clear_pointer_impl (DBusMessage, pointer_to_message,
  58 -                            dbus_message_unref);
  59 -}
  60 +#define dbus_clear_message(pointer) \
  61 +       _dbus_clear_pointer_impl(DBusMessage, (pointer), dbus_message_unref)
  62
  63  /** @} */
  64
  65 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-pending-call.h a/dbus/dbus-pending-call.h
  66 --- a~/dbus/dbus-pending-call.h 1970-01-01 00:00:00
  67 +++ a/dbus/dbus-pending-call.h  1970-01-01 00:00:00
  68 @@ -84,12 +84,9 @@ void*       dbus_pending_call_get_data
  69   * pointer_to_pending_call must not be #NULL, but *pointer_to_pending_call
  70   * may be #NULL.
  71   */
  72 -static inline void
  73 -dbus_clear_pending_call (DBusPendingCall **pointer_to_pending_call)
  74 -{
  75 -  _dbus_clear_pointer_impl (DBusPendingCall, pointer_to_pending_call,
  76 -                            dbus_pending_call_unref);
  77 -}
  78 +#define dbus_clear_pending_call(pointer) \
  79 +       _dbus_clear_pointer_impl(DBusPendingCall, (pointer), \
  80 +       dbus_pending_call_unref)
  81
  82  /** @} */
  83
  84 diff -wpruN --no-dereference '--exclude=*.orig' a~/dbus/dbus-server.h a/dbus/dbus-server.h
  85 --- a~/dbus/dbus-server.h       1970-01-01 00:00:00
  86 +++ a/dbus/dbus-server.h        1970-01-01 00:00:00
  87 @@ -112,11 +112,8 @@ void*       dbus_server_get_data
  88   * pointer_to_server must not be #NULL, but *pointer_to_server
  89   * may be #NULL.
  90   */
  91 -static inline void
  92 -dbus_clear_server (DBusServer **pointer_to_server)
  93 -{
  94 -  _dbus_clear_pointer_impl (DBusServer, pointer_to_server, dbus_server_unref);
  95 -}
  96 +#define dbus_clear_server(pointer) \
  97 +       _dbus_clear_pointer_impl(DBusServer, (pointer), dbus_server_unref)
  98
  99  /** @} */
 100