From b3416423b1e3c17357833d896c1b7cd684660771 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 16 Jan 2005 02:23:56 +0000 Subject: 2005-01-15 Havoc Pennington * test/glib/test-profile.c (with_bus_server_filter): fix crash * dbus/dbus-marshal-basic.c (_dbus_unpack_uint32): inline as macro when DBUS_DISABLE_ASSERT (_dbus_marshal_set_basic): be sure we align for the string length * dbus/dbus-marshal-recursive.c (skip_one_complete_type): make this look faster * dbus/dbus-string.c (_dbus_string_get_const_data_len): add an inline macro version (_dbus_string_set_byte): provide inline macro version --- dbus/dbus-string.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-string.c') diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index 777461ed..dccf5176 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -1,7 +1,7 @@ /* -*- mode: C; c-file-style: "gnu" -*- */ /* dbus-string.c String utility class (internal to D-BUS implementation) * - * Copyright (C) 2002, 2003, 2004 Red Hat, Inc. + * Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. * * Licensed under the Academic Free License version 2.1 * @@ -517,6 +517,8 @@ _dbus_string_get_data_len (DBusString *str, return real->str + start; } +/* only do the function if we don't have the macro */ +#ifndef _dbus_string_get_const_data_len /** * const version of _dbus_string_get_data_len(). * @@ -538,7 +540,10 @@ _dbus_string_get_const_data_len (const DBusString *str, return real->str + start; } +#endif /* _dbus_string_get_const_data_len */ +/* only do the function if we don't have the macro */ +#ifndef _dbus_string_set_byte /** * Sets the value of the byte at the given position. * @@ -557,6 +562,7 @@ _dbus_string_set_byte (DBusString *str, real->str[i] = byte; } +#endif /* _dbus_string_set_byte */ /* only have the function if we didn't create a macro */ #ifndef _dbus_string_get_byte -- cgit