diff libpurple/media.h @ 26520:fd97c0de433d

Add PURPLE to the media header sentinels and reorder includes to fix building gf2
author Paul Aurich <paul@darkrain42.org>
date Sun, 05 Apr 2009 04:34:48 +0000
parents 9eb8c8ec0a75
children bc7fac8e2f79 df9042312063
line wrap: on
line diff
--- a/libpurple/media.h	Sat Apr 04 07:39:33 2009 +0000
+++ b/libpurple/media.h	Sun Apr 05 04:34:48 2009 +0000
@@ -24,11 +24,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MEDIA_H_
-#define __MEDIA_H_
-
-#include "signals.h"
-#include "util.h"
+#ifndef _PURPLE_MEDIA_H_
+#define _PURPLE_MEDIA_H_
 
 #include <glib.h>
 #include <glib-object.h>
@@ -129,6 +126,9 @@
 	PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
 } PurpleMediaNetworkProtocol;
 
+#include "signals.h"
+#include "util.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -685,4 +685,4 @@
 
 G_END_DECLS
 
-#endif  /* __MEDIA_H_ */
+#endif  /* _PURPLE_MEDIA_H_ */