Made headers C++-safe (bug #1376379).

darcs-hash:20060103204348-65a35-293d8b6f87eb77457887e8ce70289db22e8d7690.gz

libsofia-sip-ua/bnf/bnf.h

@@ -35,6 +35,8 @@
  *
  */
 
+#include <string.h>
+
 /* Parsing tokens */
 /** Control characters. */
 #define CTL   "\001\002\003\004\005\006\007" \
@@ -153,9 +155,13 @@ enum {
 #define BNF_DLL __declspec(dllimport)
 #endif
 #endif
-BNF_DLL
+
+BNF_DLL extern 
+#ifdef __cplusplus
+"C"
+#endif
 /** Table for determining class of a character */
-extern unsigned char const _bnf_table[256];
+unsigned char const _bnf_table[256];
 
 /** Get number of characters before CRLF */
 #define span_non_crlf(s) strcspn(s, CR LF)

libsofia-sip-ua/features/sofia_sip_features.h.in

@@ -38,6 +38,10 @@
 /** Define as current Sofia name and version */
 #define SOFIA_SIP_NAME_VERSION   "@PACKAGE_NAME@-@PACKAGE_VERSION@"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern char const * const sofia_sip_name_version;
 extern char const * const sofia_sip_has_smime;
 extern char const * const sofia_sip_has_tls;
@@ -51,4 +55,8 @@ extern char const * const sofia_sip_has_upnp;
 extern char const * const sofia_sip_has_sctp;
 extern char const * const sofia_sip_has_ipv6;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

libsofia-sip-ua/http/http.h

@@ -46,6 +46,8 @@
 #include <msg_mime.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /* ----------------------------------------------------------------------
  * 1) Constants 
  */
@@ -475,4 +477,6 @@ union http_header_u {
 
 #include <http_dll.h>
 
+SOFIA_END_DECLS
+
 #endif /* !defined(HTTP_H) */

libsofia-sip-ua/http/http_hclasses.h

@@ -36,6 +36,8 @@
 #include <msg_types.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /* Use directly these header classes */
 
 #define http_accept_class              msg_accept_class
@@ -62,4 +64,6 @@
 #undef HTTP_HCLASSES_ONLY
 #endif
 
+SOFIA_END_DECLS
+
 #endif /* !defined HTTP_HCLASSES_H */

libsofia-sip-ua/http/http_header.h

@@ -50,6 +50,8 @@
 #include <msg_header.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /* ----------------------------------------------------------------------
  * 1) Macros
  */
@@ -252,4 +254,6 @@ int http_query_parse(char *query,
 #include <http_protos.h>
 #endif
 
+SOFIA_END_DECLS
+
 #endif /* !defined(HTTP_HEADER_H) */

libsofia-sip-ua/http/http_parser.h

@@ -24,8 +24,6 @@
 
 #ifndef HTTP_PARSER_H /**Defined when http_parser.h has been included.*/
 #define HTTP_PARSER_H 
-
-
 /**@file http_parser.h
  * @brief Typedefs and prototypes used by HTTP parser.
  *
@@ -58,6 +56,8 @@
 #include <http_header.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /* ---------------------------------------------------------------------------
  * 1) Macros for defining boilerplate functions and structures for each header
  */
@@ -66,8 +66,6 @@
 #define HTTP_HCLASS_TEST(x) ((x) && (x)->hc_tag == HTTP_PROTOCOL_TAG)
 #define HTTP_HDR_TEST(x)    ((x)->sh_class && HTTP_HCLASS_TEST((x)->sh_class))
 
-#define http_no_update NULL
-
 /** Define a header class for a HTTP header. */
 #define HTTP_HEADER_CLASS(c, l, params, kind, dup) \
   MSG_HEADER_CLASS(http_, c, l, "", params, kind, http_ ## dup, http_no)
@@ -111,5 +109,8 @@ int http_extract_body(msg_t *msg, http_t *http, char b[], int bsiz, int eos);
 #define http_default_dup_xtra msg_default_dup_xtra
 #define http_default_dup_one  msg_default_dup_one
 
-#endif /* !defined(HTTP_PARSER_H) */
+#define http_no_update NULL
 
+SOFIA_END_DECLS
+
+#endif /* !defined(HTTP_PARSER_H) */

libsofia-sip-ua/http/http_protos.h.in

@@ -52,7 +52,7 @@
   ((http_header_t *)msg_header_make((h), (c), (s)))
 #define http_header_vformat(h, c, f, a) \
   ((http_header_t *)msg_header_vformat((h), (c), (f), (a)))
-
+SOFIA_BEGIN_DECLS
 
 /* Declare internal prototypes for #xxxxxxx_xxxxxxx# */
 
@@ -304,5 +304,5 @@ http_#xxxxxx#_t *http_#xxxxxx#_make(su_home_t *home, char const *s)
 /** @} */
 
 
-
+SOFIA_END_DECLS
 #endif /* !defined(HTTP_PROTOS_H) */

libsofia-sip-ua/http/http_status.h

@@ -34,8 +34,11 @@
  * @date Created: Tue Sep 18 18:55:09 2001 ppessi
  */
 
+#include <su_config.h>
 #include <http_dll.h>
 
+SOFIA_BEGIN_DECLS
+
 char const *http_status_phrase(int status);
 
 #define HTTP_100_CONTINUE	       100, http_100_continue
@@ -122,4 +125,6 @@ HTTP_DLL extern char const http_503_no_service[];
 HTTP_DLL extern char const http_504_gateway_timeout[];
 HTTP_DLL extern char const http_505_http_version[];
 
+SOFIA_END_DECLS
+
 #endif /* HTTP_STATUS_H */

libsofia-sip-ua/http/http_tag.h.in

@@ -55,6 +55,8 @@
 #include <http.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 #define HTTPTAG(c, x)         httptag_##c, httptag_##c##_v(x)
 #define HTTPTAG_REF(c, x)     httptag_##c##_ref, httptag_##c##_vr(&(x))
 #define HTTPTAG_STR(c, s)     httptag_##c##_str, tag_str_v(s)
@@ -225,5 +227,5 @@ httptag_#xxxxxx#_vr(http_#xxxxxx#_t const **vp)
 #define httptag_#xxxxxx#_vr(vp) (tag_value_t)(vp)
 #endif
 
-
+SOFIA_END_DECLS
 #endif /* !defined(HTTP_TAG_H) */

libsofia-sip-ua/http/http_tag_class.h

@@ -42,6 +42,8 @@
 #include <msg_tag_class.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /** Define a named tag type for HTTP header @a t. */
 #define HTTPHDRTAG_NAMED_TYPEDEF(n, t) \
 {{ TAG_NAMESPACE, #n, httphdrtag_class, \
@@ -66,4 +68,6 @@ tagi_t *httptag_filter(tagi_t *dst, tagi_t const f[], tagi_t const *src,
 
 #endif /* !defined(HTTP_TAG_CLASS_H) */
 
+SOFIA_END_DECLS
+
 

libsofia-sip-ua/ipt/base64.h

@@ -43,6 +43,10 @@
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
  */
 
+#include <su_config.h>
+
+SOFIA_BEGIN_DECLS
+
 /** Decode a BASE64-encoded string. */
 int base64_d(char buf[], int bsiz, char const *b64s);
 /** Encode data with BASE64. */
@@ -51,4 +55,6 @@ int base64_e(char buf[], int bsiz, void *data, int dsiz);
 /** Calculate size of n bytes encoded in base64 */
 #define BASE64_SIZE(n) ((((n) + 2) / 3) * 4)
 
+SOFIA_END_DECLS
+
 #endif /* !BASE_64 */

libsofia-sip-ua/ipt/rc4.h

@@ -26,13 +26,17 @@
 #define RC4_H
 
 /**@file rc4.h
- * @brief 
+ * @brief Arcfour random number generator.
  * 
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
  *  
  * @date Created: Sun Jun  9 14:32:58 1996 ppessi
  */
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /** Byte. */
 typedef unsigned char rc4_u8;
 
@@ -53,4 +57,8 @@ void rc4_init(const void *seed, int seed_len, rc4_t *state);
 /** Generate RC4 stream. */ 
 void rc4(void *buffer, int len, rc4_t *state);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* !defined RC4_H */

libsofia-sip-ua/ipt/sha1.h

@@ -60,16 +60,8 @@
 #ifndef _SHA1_H_
 #define _SHA1_H_
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-/* Define HAVE_STDINT_H as 1 if you have <stdint.h>, 
-   or HAVE_INTTYPES_H if you have <inttypes.h> */
-typedef unsigned int uint32_t;
-typedef short int int_least16_t;
-typedef unsigned char uint8_t;
+#ifndef SU_TYPES_H
+#include <su_types.h>
 #endif
 
 /*

libsofia-sip-ua/ipt/string0.h

@@ -34,10 +34,14 @@
  *
  */
 
+#ifndef SU_CONFIG_H
 #include <su_config.h>
+#endif
 
 #include <string.h>
 
+SOFIA_BEGIN_DECLS
+
 #if SU_HAVE_INLINE
 su_inline
 #endif
@@ -148,4 +152,6 @@ size_t strncspn(char const *s, size_t ssize, char const *reject)
 
 #endif
 
+SOFIA_END_DECLS
+
 #endif /* !STRING0_H */

libsofia-sip-ua/ipt/token64.h

@@ -35,9 +35,15 @@
  *
  */
 
+#include <su_config.h>
+
+SOFIA_BEGIN_DECLS
+
 int token64_e(char b[], int bsiz, void const *data, int dlen);
 
 /** Calculate size of n bytes encoded in token-64 */
 #define TOKEN64_SIZE(n) (((n + 2) / 3) * 4)
 
+SOFIA_END_DECLS
+
 #endif /* !TOKEN64_H */

libsofia-sip-ua/ipt/uniqueid.h

@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef UNIQUEID_H /** Defined when <uniqueid.h> has been included. */
+#define UNIQUEID_H 
+
 /**@file uniqueid.h
  *
  * Compatibility functions to handle GloballyUniqueID.
@@ -33,10 +36,6 @@
  * @date Created: Tue Apr 15 06:31:41 1997 pessi
  */
 
-#ifndef UNIQUEID_H /** Defined when <uniqueid.h> has been included. */
-#define UNIQUEID_H 
-
-
 /* Compatibility functionality */
 #define guid_t su_guid_t 
 #define guid_generate su_guid_generate

libsofia-sip-ua/ipt/utf8.h

@@ -41,16 +41,11 @@
 #ifndef UTF8_H /** Defined when <utf8.h> has been included */
 #define	UTF8_H
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
-#if 0
-}
+#ifndef SU_TYPES_H
+#include <su_types.h>
 #endif
 
-#ifndef _SIZE_T
-#include <stddef.h>
-#endif
+SOFIA_BEGIN_DECLS
 
 typedef unsigned char  utf8;
 typedef unsigned short utf16;
@@ -184,8 +179,6 @@ int ucs4ncmp(ucs4 const *s1, ucs4 const *s2, size_t n);
 		      (s)[4]=((c>>6)&63)|128,\
 		      (s)[5]=((c)&63)|128)
      
-#ifdef	__cplusplus
-}
-#endif
+SOFIA_END_DECLS
 
 #endif /* UTF8_H */

libsofia-sip-ua/iptsec/auth_client.h

@@ -44,6 +44,8 @@
 #include <url.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /** Authenticator object. */
 typedef struct auth_client_s auth_client_t;
 
@@ -79,4 +81,6 @@ struct sip_s;
 int auc_with_uicc(auth_client_t **auc, su_home_t *home, struct uicc_s *uicc);
 int auc_authorize(auth_client_t **auc, msg_t *msg, struct sip_s *sip);
 
+SOFIA_END_DECLS
+
 #endif 

libsofia-sip-ua/iptsec/auth_digest.h

@@ -25,7 +25,6 @@
 #ifndef AUTH_DIGEST_H /** Defined when <auth_digest.h> has been included. */
 #define AUTH_DIGEST_H 
 
-
 /**@file auth_digest.h 
  * Datatypes and functions for Digest authentication.
  *
@@ -49,6 +48,8 @@
 #include <su_alloc.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 /** Parameters for digest-challenge.
  *
  * The digest-challenge is sent by server or proxy to client. It can be
@@ -153,4 +154,6 @@ int auth_digest_response(auth_response_t *, auth_hexmd5_t response,
 			 auth_hexmd5_t const ha1, 
 			 char const *method_name, void const *data, int dlen);
 
+SOFIA_END_DECLS
+
 #endif

libsofia-sip-ua/iptsec/auth_module.h

@@ -22,10 +22,8 @@
  *
  */
 
-#ifndef AUTH_MODULE_H
-/** Defined when <auth_module.h> has been included. @HI */
+#ifndef AUTH_MODULE_H /** Defined when auth_module.h has been included. */
 #define AUTH_MODULE_H 
-  
 
 /**@file auth_module.h  
  * @brief Authentication verification interface for NTA network elements.
@@ -54,6 +52,8 @@
 #include <url_tag.h>
 #endif
 
+SOFIA_BEGIN_DECLS
+
 typedef struct auth_mod_t auth_mod_t;
 /** Authentication operation. */
 typedef struct auth_status_t auth_status_t;
@@ -65,7 +65,7 @@ typedef void auth_magic_t;
 #endif
 
 /** Virtual table for authentication plugin. */
-typedef struct auth_scheme_t const auth_scheme_t;
+typedef struct auth_scheme const auth_scheme_t;
 
 /** Opaque data used by authentication plugin module. */
 typedef struct auth_plugin_t  auth_plugin_t;
@@ -354,4 +354,6 @@ AUTH_DLL extern tag_typedef_t authtag_cache_errors;
 #define AUTHTAG_CACHE_ERRORS_REF(x) authtag_cache_errors_ref, tag_uint_vr((&x))
 AUTH_DLL extern tag_typedef_t authtag_cache_errors_ref;
 
+SOFIA_END_DECLS
+
 #endif