changeset 27542:e574d1858b5a

merge of '03e0254c6871c4730755a200d34d4adacdf40c66' and 'fe1b9e426c3f6f96ab00db928c3c9249746e5845'
author Mark Doliner <mark@kingant.net>
date Tue, 14 Jul 2009 21:25:10 +0000
parents 32d2caa6a777 (current diff) 0a0ece3477af (diff)
children 205267108d6e a756b4ed306e
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/privacy.h	Tue Jul 14 19:55:40 2009 +0000
+++ b/libpurple/privacy.h	Tue Jul 14 21:25:10 2009 +0000
@@ -26,12 +26,10 @@
 #ifndef _PURPLE_PRIVACY_H_
 #define _PURPLE_PRIVACY_H_
 
-#include "account.h"
-
 /**
  * Privacy data types.
  */
-typedef enum _PurplePrivacyType
+typedef enum
 {
 	PURPLE_PRIVACY_ALLOW_ALL = 1,
 	PURPLE_PRIVACY_DENY_ALL,
@@ -40,6 +38,8 @@
 	PURPLE_PRIVACY_ALLOW_BUDDYLIST
 } PurplePrivacyType;
 
+#include "account.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif