diff libpurple/protocols/msn/object.h @ 28983:462cb893521b

Minor header file cleanup. Mostly I wanted to move some enums above some #includes
author Mark Doliner <mark@kingant.net>
date Fri, 05 Feb 2010 22:49:11 +0000
parents b65997110933
children 76049fde7ad2 4445ae4215b8
line wrap: on
line diff
--- a/libpurple/protocols/msn/object.h	Fri Feb 05 14:40:39 2010 +0000
+++ b/libpurple/protocols/msn/object.h	Fri Feb 05 22:49:11 2010 +0000
@@ -21,12 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_OBJECT_H_
-#define _MSN_OBJECT_H_
-
-#include "imgstore.h"
-
-#include "internal.h"
+#ifndef MSN_OBJECT_H
+#define MSN_OBJECT_H
 
 typedef enum
 {
@@ -36,8 +32,11 @@
 	MSN_OBJECT_USERTILE   =  3, /**< UserTile (buddy icon) */
 	MSN_OBJECT_RESERVED2  =  4, /**< Reserved              */
 	MSN_OBJECT_BACKGROUND =  5  /**< Background            */
+} MsnObjectType;
 
-} MsnObjectType;
+#include "internal.h"
+
+#include "imgstore.h"
 
 typedef struct
 {
@@ -51,7 +50,6 @@
 	char *friendly;
 	char *sha1d;
 	char *sha1c;
-
 } MsnObject;
 
 /**
@@ -239,4 +237,4 @@
 
 void msn_object_set_local(MsnObject *obj);
 
-#endif /* _MSN_OBJECT_H_ */
+#endif /* MSN_OBJECT_H */