Commit c791c187 authored by Dafydd Harries's avatar Dafydd Harries

tidy up headers/#includes

darcs-hash:20070129173049-c9803-6719527a015d994ff576293d155b8d1507a70ea9.gz
parent 8a4a358c
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef _ADDRESS_H #ifndef _ADDRESS_H
#define _ADDRESS_H #define _ADDRESS_H
G_BEGIN_DECLS
typedef enum address_type NiceAddressType; typedef enum address_type NiceAddressType;
enum address_type enum address_type
...@@ -38,5 +40,7 @@ nice_address_equal (NiceAddress *a, NiceAddress *b); ...@@ -38,5 +40,7 @@ nice_address_equal (NiceAddress *a, NiceAddress *b);
gchar * gchar *
nice_address_to_string (NiceAddress *addr); nice_address_to_string (NiceAddress *addr);
G_END_DECLS
#endif /* _ADDRESS_H */ #endif /* _ADDRESS_H */
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "address.h" #include "address.h"
#include "candidate.h" #include "candidate.h"
G_BEGIN_DECLS
/*** event ***/ /*** event ***/
...@@ -97,5 +98,7 @@ const GSList * ...@@ -97,5 +98,7 @@ const GSList *
nice_agent_get_local_candidates ( nice_agent_get_local_candidates (
NiceAgent *agent); NiceAgent *agent);
G_END_DECLS
#endif /* _AGENT_H */ #endif /* _AGENT_H */
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef _CANDIDATE_H #ifndef _CANDIDATE_H
#define _CANDIDATE_H #define _CANDIDATE_H
G_BEGIN_DECLS
typedef enum candidate_type NiceCandidateType; typedef enum candidate_type NiceCandidateType;
enum candidate_type enum candidate_type
...@@ -42,5 +44,7 @@ nice_candidate_jingle_priority (NiceCandidate *candidate); ...@@ -42,5 +44,7 @@ nice_candidate_jingle_priority (NiceCandidate *candidate);
guint32 guint32
nice_candidate_ice_priority (NiceCandidate *candidate); nice_candidate_ice_priority (NiceCandidate *candidate);
G_END_DECLS
#endif /* _CANDIDATE_H */ #endif /* _CANDIDATE_H */
#include <arpa/inet.h> #include "agent.h"
#include <glib.h>
#include <udp.h>
#include <agent.h>
void void
handle_recv ( handle_recv (
......
#include <arpa/inet.h>
#include <glib.h>
#include "udp.h"
#include "agent.h" #include "agent.h"
int int
......
#include <string.h> #include <string.h>
#include <arpa/inet.h> #include "udp-fake.h"
#include "agent.h"
#include <glib.h>
#include <udp.h>
#include <udp-fake.h>
#include <agent.h>
static gboolean cb_called = FALSE; static gboolean cb_called = FALSE;
......
#include <string.h> #include <string.h>
#include <arpa/inet.h> #include "stun.h"
#include "udp-fake.h"
#include <glib.h> #include "agent.h"
#include <stun.h>
#include <udp.h>
#include <udp-fake.h>
#include <agent.h>
void void
handle_recv ( handle_recv (
......
#include <arpa/inet.h> #include "udp-fake.h"
#include "agent.h"
#include <glib.h>
#include <udp.h>
#include <udp-fake.h>
#include <agent.h>
void void
handle_recv ( handle_recv (
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
#ifndef _LOCAL_H #ifndef _LOCAL_H
#define _LOCAL_H #define _LOCAL_H
#include <glib.h>
G_BEGIN_DECLS
typedef guint32 addr_ipv4; typedef guint32 addr_ipv4;
typedef struct _interface interface; typedef struct _interface interface;
...@@ -21,5 +25,7 @@ interface_free (interface *iface); ...@@ -21,5 +25,7 @@ interface_free (interface *iface);
GSList * GSList *
list_local_interfaces (); list_local_interfaces ();
G_END_DECLS
#endif /* _LOCAL_H */ #endif /* _LOCAL_H */
#include <string.h> #include <string.h>
#include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <glib.h>
#include <udp.h> #include "udp.h"
#include <stun.h> #include "stun.h"
#include <agent.h> #include "agent.h"
#include <readline.h> #include "readline.h"
#include <util.h> #include "util.h"
static void static void
handle_recv ( handle_recv (
......
#ifndef _READLINE_H
#define _READLINE_H
#include <glib.h>
G_BEGIN_DECLS
gchar * gchar *
readline (guint fileno); readline (guint fileno);
G_END_DECLS
#endif /* _READLINE_H */
#ifndef _UTIL_H
#define _UTIL_H
#include <glib.h>
#include "agent.h"
G_BEGIN_DECLS
NiceCandidate * NiceCandidate *
nice_candidate_from_string (const gchar *s); nice_candidate_from_string (const gchar *s);
gchar * gchar *
nice_candidate_to_string (NiceCandidate *candidate); nice_candidate_to_string (NiceCandidate *candidate);
G_END_DECLS
#endif /* _UTIL_H */
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS
typedef enum { typedef enum {
STUN_MESSAGE_BINDING_REQUEST = 0x001, STUN_MESSAGE_BINDING_REQUEST = 0x001,
STUN_MESSAGE_BINDING_RESPONSE = 0x101, STUN_MESSAGE_BINDING_RESPONSE = 0x101,
...@@ -83,5 +85,7 @@ G_GNUC_WARN_UNUSED_RESULT ...@@ -83,5 +85,7 @@ G_GNUC_WARN_UNUSED_RESULT
StunMessage * StunMessage *
stun_message_unpack (guint length, gchar *s); stun_message_unpack (guint length, gchar *s);
G_END_DECLS
#endif /* __STUN_H__ */ #endif /* __STUN_H__ */
#include <string.h> #include <string.h>
#include <arpa/inet.h> #include "udp.h"
#include "udp-fake.h"
#include <glib.h>
#include <udp.h>
#include <udp-fake.h>
int int
main (void) main (void)
......
#ifndef _UDP_FAKE_H
#define _UDP_FAKE_H
#include <arpa/inet.h>
#include <glib.h>
#include "udp.h"
G_BEGIN_DECLS
void void
udp_fake_socket_manager_init (UDPSocketManager *man); udp_fake_socket_manager_init (UDPSocketManager *man);
void void
...@@ -14,3 +25,7 @@ udp_fake_socket_pop_send ( ...@@ -14,3 +25,7 @@ udp_fake_socket_pop_send (
guint len, guint len,
gchar *buf); gchar *buf);
G_END_DECLS
#endif /* _UDP_FAKE_H */
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
#ifndef _UDP_H #ifndef _UDP_H
#define _UDP_H #define _UDP_H
#include <arpa/inet.h>
#include <glib.h>
G_BEGIN_DECLS
typedef struct _UDPSocket UDPSocket; typedef struct _UDPSocket UDPSocket;
struct _UDPSocket struct _UDPSocket
...@@ -60,5 +66,7 @@ udp_socket_send ( ...@@ -60,5 +66,7 @@ udp_socket_send (
void void
udp_socket_close (UDPSocket *sock); udp_socket_close (UDPSocket *sock);
G_END_DECLS
#endif /* _UDP_H */ #endif /* _UDP_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment