Mercurial > pidgin.yaz
changeset 29865:1140ced9b4f6
merge of '88e861487c0bb038a99ebb6d7675ae45f749e799'
and 'c7a31c2a657883fbaf9577a5d0fd7c2b7731e207'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 09 Feb 2010 22:39:08 +0000 |
| parents | b052a711cfbd (current diff) d780d89dc079 (diff) |
| children | 5b1b7c5393f6 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.h Tue Feb 09 22:07:48 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.h Tue Feb 09 22:39:08 2010 +0000 @@ -378,6 +378,8 @@ OSCAR_CAPABILITY_NEWCAPS = 0x20000000, OSCAR_CAPABILITY_XTRAZ = 0x40000000, OSCAR_CAPABILITY_GENERICUNKNOWN = 0x80000000, +#warning Fix OSCAR_CAPABILITY_LAST situation + // TODO: We're out of bits. Rework things that depend on this or remove some capability. (Or, ensure this is a 64-bit type.) OSCAR_CAPABILITY_LAST = 0x100000000 } OscarCapability;