Commit ff37a396 authored by Pekka Pessi's avatar Pekka Pessi

su.h, su_debug.h. tport.h, sip_header.h, http_hclasses.h, http_header.h,...

su.h, su_debug.h. tport.h, sip_header.h, http_hclasses.h, http_header.h, nea.h, msg_header.h: moved #include<>s outside SOFIA_BEGIN_DECLS/SOFIA_END_DECLS

darcs-hash:20060925234540-65a35-1a5b8207e6f6016379fbabbdb65f99f53e372203.gz
parent 9cd997e1
......@@ -59,12 +59,12 @@ SOFIA_BEGIN_DECLS
#define http_separator_class msg_separator_class
#define http_payload_class msg_payload_class
SOFIA_END_DECLS
#ifndef HTTP_PROTOS_H
#define HTTP_HCLASSES_ONLY
#include <sofia-sip/http_protos.h>
#undef HTTP_HCLASSES_ONLY
#endif
SOFIA_END_DECLS
#endif /* !defined HTTP_HCLASSES_H */
......@@ -260,10 +260,10 @@ http_separator_t *http_separator_create(su_home_t *home)
}
#endif
SOFIA_END_DECLS
#ifndef HTTP_PROTOS_H
#include <sofia-sip/http_protos.h>
#endif
SOFIA_END_DECLS
#endif /* !defined(HTTP_HEADER_H) */
......@@ -278,10 +278,10 @@ enum {
/** No header. */
#define MSG_HEADER_NONE ((msg_header_t *)-1)
SOFIA_END_DECLS
#ifndef MSG_PROTOS_H
#include <sofia-sip/msg_protos.h>
#endif
SOFIA_END_DECLS
#endif /** !defined(MSG_HEADER_H) */
......@@ -44,6 +44,10 @@
#include <sofia-sip/nta.h>
#endif
#ifndef NEA_TAG_H
#include <sofia-sip/nea_tag.h>
#endif
SOFIA_BEGIN_DECLS
#define NEA_VERSION 3.0
......@@ -51,10 +55,6 @@ SOFIA_BEGIN_DECLS
#define NEA_DEFAULT_EXPIRES 3600
#ifndef NEA_TAG_H
#include <sofia-sip/nea_tag.h>
#endif
/** Event notifier object. */
typedef struct nea_server_s nea_server_t;
......
......@@ -100,7 +100,7 @@ SOFIAPUBFUN int sip_add_tl(msg_t *msg, sip_t *sip,
/** Add duplicates of headers from taglist to the SIP message. */
SOFIAPUBFUN int sip_add_tagis(msg_t *, sip_t *, tagi_t const **inout_list);
/** Add a header to the SIP message. */
/** Parse a string as a header and add it to the SIP message. */
SOFIAPUBFUN int sip_add_make(msg_t *, sip_t *, msg_hclass_t *hc, char const *s);
/** Complete SIP message. */
......@@ -176,7 +176,11 @@ SOFIAPUBVAR char const * const sip_method_names[];
#define sip_header_vformat(h, c, f, a) \
((sip_header_t *)msg_header_vformat((h), (c), (f), (a)))
SOFIA_END_DECLS
#ifndef SIP_PROTOS_H
#include <sofia-sip/sip_protos.h>
#endif
SOFIA_BEGIN_DECLS
/** Create a request line object. */
SOFIAPUBFUN
......
......@@ -301,8 +301,6 @@ issize_t su_vrecv(su_socket_t, su_iovec_t iov[], isize_t len, int flags,
/** Return local IP address */
SOFIAPUBFUN int su_getlocalip(su_sockaddr_t *sin);
#include <sofia-sip/su_addrinfo.h>
#if SU_HAVE_BSDSOCK
#define su_ioctl ioctl
/*
......@@ -459,4 +457,8 @@ SOFIAPUBFUN void su_canonize_sockaddr(su_sockaddr_t *su);
SOFIA_END_DECLS
#ifndef SU_ADDRINFO_H
#include <sofia-sip/su_addrinfo.h>
#endif
#endif /* !defined(SU_H) */
......@@ -63,10 +63,6 @@ SOFIA_BEGIN_DECLS
((SU_LOG != NULL && SU_LOG->log_init > 1) ? \
SU_LOG->log_level : su_log_default->log_level))
#ifndef SU_CONFIG_H
#include <sofia-sip/su_config.h>
#endif
#if SU_DEBUG_MAX >= 0
#ifndef SU_LOG
#define SU_LOG (su_log_default)
......
......@@ -45,6 +45,9 @@
#ifndef URL_H
#include <sofia-sip/url.h>
#endif
#ifndef TPORT_TAG_H
#include <sofia-sip/tport_tag.h>
#endif
SOFIA_BEGIN_DECLS
......@@ -163,8 +166,6 @@ typedef struct {
(n)->tpn_comp ? ";comp=" : "", (n)->tpn_comp ? (n)->tpn_comp : "", \
(n)->tpn_ident ? "/" : "", (n)->tpn_ident ? (n)->tpn_ident : ""
#include <sofia-sip/tport_tag.h>
/** Create first primary transport. */
TPORT_DLL tport_t *tport_tcreate(tp_stack_t *stack,
tport_stack_class_t const *tpac,
......
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