Mercurial > pidgin
comparison libpurple/media.h @ 26438: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 |
comparison
equal
deleted
inserted
replaced
26437:9eb8c8ec0a75 | 26438:fd97c0de433d |
---|---|
22 * You should have received a copy of the GNU General Public License | 22 * You should have received a copy of the GNU General Public License |
23 * along with this program; if not, write to the Free Software | 23 * along with this program; if not, write to the Free Software |
24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
25 */ | 25 */ |
26 | 26 |
27 #ifndef __MEDIA_H_ | 27 #ifndef _PURPLE_MEDIA_H_ |
28 #define __MEDIA_H_ | 28 #define _PURPLE_MEDIA_H_ |
29 | |
30 #include "signals.h" | |
31 #include "util.h" | |
32 | 29 |
33 #include <glib.h> | 30 #include <glib.h> |
34 #include <glib-object.h> | 31 #include <glib-object.h> |
35 | 32 |
36 G_BEGIN_DECLS | 33 G_BEGIN_DECLS |
126 | 123 |
127 typedef enum { | 124 typedef enum { |
128 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, | 125 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, |
129 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP, | 126 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP, |
130 } PurpleMediaNetworkProtocol; | 127 } PurpleMediaNetworkProtocol; |
128 | |
129 #include "signals.h" | |
130 #include "util.h" | |
131 | 131 |
132 #ifdef __cplusplus | 132 #ifdef __cplusplus |
133 extern "C" { | 133 extern "C" { |
134 #endif | 134 #endif |
135 | 135 |
683 } | 683 } |
684 #endif | 684 #endif |
685 | 685 |
686 G_END_DECLS | 686 G_END_DECLS |
687 | 687 |
688 #endif /* __MEDIA_H_ */ | 688 #endif /* _PURPLE_MEDIA_H_ */ |