Commit 8194b96d authored by Pekka Pessi's avatar Pekka Pessi

Reordered #includes in sip module.

Avoid #include ordering problem with sip_parser.h.

darcs-hash:20060511095717-65a35-fbe53f23899ea9595b093d9c3e60787bc9e56c27.gz
parent 2b480f01
......@@ -37,15 +37,12 @@
#include "config.h"
#include <stddef.h>
#include <stdlib.h>
#include <sofia-sip/string0.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include <limits.h>
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/su_alloc.h>
#include <sofia-sip/string0.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/sip_util.h>
......@@ -55,6 +52,13 @@
#include <sofia-sip/su_uniqueid.h>
#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include <limits.h>
/* ====================================================================== */
/**@SIP_HEADER sip_request Request Line
......
......@@ -37,14 +37,17 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include "sofia-sip/sip_parser.h"
#include <assert.h>
/* ====================================================================== */
......
......@@ -26,7 +26,8 @@
* @brief Event SIP headers.
*
* The file @b sip_event.c contains implementation of header classes for
* event-related SIP headers @b Event and @b Allow-Events.
* event-related SIP headers @b Event, @b Allow-Events, and
* @b Subscription-State.
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>.
*
......@@ -35,14 +36,16 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include "sofia-sip/sip_parser.h"
/* ====================================================================== */
......
......@@ -36,14 +36,17 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
#include <stdio.h>
#include "sofia-sip/sip_parser.h"
#include <assert.h>
/* ====================================================================== */
......
......@@ -33,14 +33,17 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
#include "sofia-sip/sip_parser.h"
/* ====================================================================== */
/**@SIP_HEADER sip_allow Allow Header
......
......@@ -33,6 +33,17 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
/* Get bodies of inlined functions included in library */
#define SIP_STATIC_INLINE
#include <sofia-sip/su_alloc.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/sip_status.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
......@@ -42,13 +53,6 @@
#include <assert.h>
#include <sofia-sip/su_alloc.h>
#define SIP_STATIC_INLINE
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/sip_status.h>
/** Copy a SIP header. */
sip_header_t *sip_header_copy(su_home_t *home, sip_header_t const *h)
{
......
......@@ -33,16 +33,18 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include "sofia-sip/msg_mime_protos.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
#include "sofia-sip/sip_parser.h"
#include "sofia-sip/msg_mime_protos.h"
/* ====================================================================== */
/**@SIP_HEADER sip_accept Accept Header
......
......@@ -34,6 +34,14 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/su_tagarg.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/msg_mclass.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
......@@ -41,12 +49,6 @@
#include <assert.h>
#include <limits.h>
#include <stdarg.h>
#include <sofia-sip/su_tagarg.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/msg_mclass.h>
/** Version of the SIP module */
char const sip_parser_version[] = VERSION;
......
......@@ -44,6 +44,10 @@
#include <stddef.h>
#include <string.h>
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/sip_parser.h>
#include <sofia-sip/msg_mclass.h>
......
......@@ -35,14 +35,17 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include "sofia-sip/sip_parser.h"
#include <assert.h>
/* ====================================================================== */
......
......@@ -25,24 +25,24 @@
/**@CFILE sip_reason.c
* @brief Reason header.
*
* The file @b sip_reason.c contains implementation of header classes for
* The file @b sip_reason.c contains implementation of header class for
* SIP header @b Reason.
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>.
*
* @date Created: Thu Sep 13 21:24:15 EEST 2001 ppessi
*/
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include "sofia-sip/sip_parser.h"
/**@SIP_HEADER sip_reason Reason Header
*
......
......@@ -35,14 +35,16 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include "sofia-sip/sip_parser.h"
/* ====================================================================== */
......
......@@ -51,14 +51,18 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <assert.h>
#include "sofia-sip/sip_parser.h"
/* ====================================================================== */
/**@SIP_HEADER sip_authorization Authorization Header
......
......@@ -35,17 +35,18 @@
#include "config.h"
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/msg_date.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdarg.h>
#include <sofia-sip/su_alloc.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/msg_date.h>
#include <assert.h>
/* ====================================================================== */
......
......@@ -33,16 +33,13 @@
#include "config.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <float.h>
#include <limits.h>
#include <ctype.h>
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/su_alloc.h>
#include <sofia-sip/su_strlst.h>
#include <sofia-sip/string0.h>
#include "sofia-sip/sip_parser.h"
#include <sofia-sip/sip_header.h>
......@@ -52,9 +49,14 @@
#include <sofia-sip/bnf.h>
#include <sofia-sip/hostdomain.h>
#ifndef STRING0_H
#include <sofia-sip/string0.h>
#endif
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <float.h>
#include <limits.h>
#include <ctype.h>
/**
* Compare two SIP addresses (@b From or @b To headers).
......
......@@ -44,11 +44,7 @@
#endif
#ifndef MSG_H
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/msg.h>
#else
#error "<sip_parser.h> must be included before <msg.h>"
#endif
#ifndef MSG_PARSER_H
......
......@@ -39,6 +39,10 @@
#include <string.h>
#include <stddef.h>
/* Avoid casting sip_t to msg_pub_t and sip_header_t to msg_header_t */
#define MSG_PUB_T struct sip_s
#define MSG_HDR_T union sip_header_u
#include <sofia-sip/su_types.h>
#include <sofia-sip/su_tag.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