diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-16 02:23:56 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-16 02:23:56 +0000 |
| commit | b3416423b1e3c17357833d896c1b7cd684660771 (patch) | |
| tree | 9f8ae4a2d65337f6b668aca787eadb8342e05db2 /dbus/dbus-string.c | |
| parent | 9c3d566e95c9080f6040c64531b0ccae22bd5d74 (diff) | |
2005-01-15 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'dbus/dbus-string.c')
| -rw-r--r-- | dbus/dbus-string.c | 8 |
1 files changed, 7 insertions, 1 deletions
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 |