--- a/libpurple/media.h Sun Apr 05 03:25:00 2009 +0000
+++ b/libpurple/media.h Sun Apr 05 21:13:10 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
@@ -694,4 +694,4 @@
G_END_DECLS
-#endif /* __MEDIA_H_ */
+#endif /* _PURPLE_MEDIA_H_ */