changeset 29472:5b1b7c5393f6

merge of 'f14dddd03f189029f2313c234b5e9dc9964b8fa8' and 'f7ee01128f9373b2d98f537af9109a36acc58d1e'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 10 Feb 2010 20:53:32 +0000
parents 5d56c0dd2810 (current diff) 1140ced9b4f6 (diff)
children 185677f47825
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.h	Wed Feb 10 20:53:18 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Wed Feb 10 20:53:32 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;