Commit 448e991a authored by Pekka Pessi's avatar Pekka Pessi

Removed *_dll.h files - defining *_DLL macros in <su_config.h>.

darcs-hash:20060123174511-65a35-3d8230634942120a42c2b93b8a285e624417a16c.gz
parent 93cd7323
......@@ -14,10 +14,15 @@ API/ABI changes and versioning
<see previous release notes at
http://sofia-sip.sourceforge.net/relnotes/ for examples ;
- should include all changes to public headers, and
other important information to developers;
- should include all changes to public headers, and
other important information to developers;
- and should be updated _continuously_! />
- Removed include files msg/msg_bnf.h msg/msg_auth.h sip/sip_extensions.h
sip/sip_internal.h and su/su_configure_win32.h
- The clone su_home_t semantics were extended.
Added su_home_is_threadsafe(), modified prototype of su_home_unref().
- Removed *_dll.h files - defining *_DLL macros in <su_config.h>.
Contributors to this release
----------------------------
......
......@@ -32,13 +32,6 @@
#include "config.h"
#include <string.h>
/* include bodies of inline functions */
#if !HAVE_INLINE
#define BNF_INLINE
#endif
#include "bnf.h"
#define ws bnf_ws
......@@ -53,7 +46,6 @@
#define smtok bnf_mark|bnf_token0|bnf_safe
#define safe bnf_safe
unsigned char const _bnf_table[256] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, ws, crlf, 0, 0, crlf, 0, 0,
......
......@@ -35,8 +35,12 @@
*
*/
#include <su_config.h>
#include <string.h>
SOFIA_BEGIN_DECLS
/* Parsing tokens */
/** Control characters. */
#define CTL "\001\002\003\004\005\006\007" \
......@@ -148,18 +152,9 @@ enum {
bnf_param = bnf_token | bnf_param0 /**< SIP/HTTP parameter */
};
#ifndef BNF_DLL
#ifndef WIN32
#define BNF_DLL
#else
#define BNF_DLL __declspec(dllimport)
#endif
#endif
BNF_DLL extern
#ifdef __cplusplus
"C"
#endif
/** Table for determining class of a character */
unsigned char const _bnf_table[256];
......@@ -303,4 +298,6 @@ static inline int span_quoted(char const *s)
/** Get number of characters belonging to url scheme */
#define span_url_scheme(s) strspn(s, URL_SCHEME)
SOFIA_END_DECLS
#endif /* !defined BNF_H */
......@@ -23,7 +23,7 @@ TESTS = test_http
# Rules for building the targets
PUBLIC_H = http.h http_header.h http_parser.h \
http_tag_class.h http_dll.h http_status.h http_hclasses.h
http_tag_class.h http_status.h http_hclasses.h
BUILT_H = http_protos.h http_tag.h
BUILT_C = http_tag.c http_tag_ref.c http_parser_table.c
......
......@@ -475,8 +475,6 @@ union http_header_u {
};
#include <http_dll.h>
SOFIA_END_DECLS
#endif /* !defined(HTTP_H) */
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
/* Define declaration specification for exporting things from a shared lib */
#ifndef HTTP_DLL
#ifndef WIN32
#define HTTP_DLL
#else
#define HTTP_DLL __declspec(dllimport)
#endif
#endif
......@@ -35,7 +35,6 @@
*/
#include <su_config.h>
#include <http_dll.h>
SOFIA_BEGIN_DECLS
......
......@@ -53,14 +53,6 @@ typedef unsigned char ucs1;
typedef unsigned short ucs2;
typedef unsigned int ucs4;
#ifndef IPT_DLL
#ifndef WIN32
#define IPT_DLL
#else
#define IPT_DLL __declspec(dllimport)
#endif
#endif
size_t utf8_width(const utf8 *);
/* Latin-1 encoding/decoding */
......
......@@ -28,7 +28,7 @@ TESTS = test_auth_digest
BUILT_SOURCES = auth_tag_ref.c
include_sofia_HEADERS = auth_client.h auth_digest.h auth_dll.h \
include_sofia_HEADERS = auth_client.h auth_digest.h \
auth_module.h auth_plugin.h
libiptsec_la_SOURCES = iptsec_debug.h \
......
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef AUTH_DLL_H /** Defined when @b <auth_dll.h> has been included. */
#define AUTH_DLL_H
/**Define declaration specifications for exporting things from @b iptsec.dll.
*/
#ifndef AUTH_DLL
#ifndef WIN32
#define AUTH_DLL
#else
#define AUTH_DLL __declspec(dllimport)
#endif
#endif
#endif
......@@ -23,7 +23,7 @@ GENERATED_H = msg_protos.h msg_mime_protos.h
PUBLIC_H = msg.h msg_header.h msg_types.h \
msg_mclass.h msg_mclass_hash.h msg_parser.h \
msg_addr.h msg_date.h msg_buffer.h \
msg_tag_class.h msg_dll.h msg_mime.h
msg_tag_class.h msg_mime.h
INTERNAL_H = msg_internal.h test_class.h
include_sofia_HEADERS = $(GENERATED_H) $(PUBLIC_H)
......
......@@ -33,7 +33,6 @@
* @date Created: Fri Feb 18 08:54:48 2000 ppessi
*/
#include <msg_dll.h>
#include <msg_types.h>
SOFIA_BEGIN_DECLS
......
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef MSG_DLL_H /** Defined when msg_dll.h has been included. */
#define MSG_DLL_H
/**@file msg_dll.h
*
* Define declaration specification for exporting things from @b msg.dll.
*/
#ifndef MSG_DLL
#ifndef WIN32
/** Attribute for symbols exported from msg library */
#define MSG_DLL
#else
#define MSG_DLL __declspec(dllimport)
#endif
#endif
/** Attribute for msg test symbols */
#define MSG_TEST_DLL
#endif /** !defined(MSG_DLL_H) */
......@@ -46,10 +46,6 @@
#include <su_tag.h>
#include <su_tag_class.h>
#ifndef MSG_DLL_H
#include <msg_dll.h>
#endif
#ifndef MSG_HEADER_H
#include <msg_header.h>
#endif
......
......@@ -47,14 +47,6 @@
#include <nta_tag.h>
#endif
#ifndef NEA_DLL
#ifndef WIN32
#define NEA_DLL
#else
#define NEA_DLL __declspec(dllimport)
#endif
#endif
SOFIA_BEGIN_DECLS
/** Event states */
......
......@@ -31,7 +31,7 @@ TESTS_ENVIRONMENT = $(SHELL)
BUILT_SOURCES = nta_tag_ref.c
include_sofia_HEADERS = nta.h nta_stateless.h nta_tport.h \
nta_tag.h nta_dll.h sl_utils.h
nta_tag.h sl_utils.h
libnta_la_SOURCES = nta.c nta_tag.c nta_tag_ref.c \
nta_internal.h \
......
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef NTA_DLL_H /** Defined when <nta_dll.h> has been included. */
#define NTA_DLL_H
/**@file nta_dll.h
*
* Define declaration specifications for exporting things from @b nta.dll.
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*
* @date Created: Fri Feb 22 15:57:00 2002 ppessi
*/
#ifndef NTA_DLL
#ifndef WIN32
#define NTA_DLL
#else
#define NTA_DLL __declspec(dllimport)
#endif
#endif
#endif /* !defined(NTA_DLL_H) */
......@@ -45,11 +45,6 @@
#include <url_tag.h>
#endif
#ifndef NTA_DLL_H
#include <nta_dll.h>
#endif
SOFIA_BEGIN_DECLS
/** List of all nta tags. */
......
......@@ -47,14 +47,6 @@
SOFIA_BEGIN_DECLS
#ifndef NTH_DLL
#ifndef WIN32
#define NTH_DLL
#else
#define NTH_DLL __declspec(dllimport)
#endif
#endif
/** List of all nth tags */
NTH_DLL extern tagi_t nth_client_tags[];
......
......@@ -911,6 +911,30 @@ extern tag_typedef_t nutag_handle;
#define NUTAG_HANDLE_REF(x) nutag_handle_ref, nutag_handle_vr(&(x))
extern tag_typedef_t nutag_handle_ref;
/** Registration handle (used with requests and nua_respond())
*
* When a new request is made or new call is responded, a new identity can
* be selected with NUTAG_IDENTITY(). The identity comprises of @b From
* header, initial route set, local contact header and media tags associated
* with it, soa handle and so on. User can make multiple registrations using
* multiple identities.
*
* @par Used with
* nua_invite()
*
* @par Parameter type
* nua_handle_t *
*
* @par Values
*
* Corresponding tag taking reference parameter is NUTAG_IDENTITY_REF()
*/
#define NUTAG_IDENTITY(x) nutag_identity, nutag_handle_v(x)
extern tag_typedef_t nutag_identity;
#define NUTAG_IDENTITY_REF(x) nutag_identity_ref, nutag_handle_vr(&(x))
extern tag_typedef_t nutag_identity_ref;
/** Refer reply handle (used with refer)
*
* When making a call in response to a REFER request [RFC3515] with
......
......@@ -41,14 +41,6 @@
#include <su_tag_class.h>
#endif
#ifndef SDP_DLL
#ifndef WIN32
#define SDP_DLL
#else
#define SDP_DLL __declspec(dllimport)
#endif
#endif
SOFIA_BEGIN_DECLS
struct sdp_session_s;
......
......@@ -27,7 +27,7 @@ H_IN = sip_hclasses.h.in sip_protos.h.in sip_tag.h.in
PUBLIC_H = sip.h sip_util.h \
sip_header.h sip_parser.h \
sip_tag_class.h sip_dll.h sip_status.h
sip_tag_class.h sip_status.h
GENERATED_C = sip_tag.c sip_tag_ref.c sip_parser_table.c
......
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef SIP_DLL_H /** Defined when @b <sip_dll.h> has been included. */
#define SIP_DLL_H
/**@file sip_dll.h
*
* Define declaration specification for exporting things from @b sip.dll.
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*/
#ifndef SIP_DLL
#ifndef WIN32
#define SIP_DLL
#else
#define SIP_DLL __declspec(dllimport)
#endif
#endif
#endif
......@@ -45,7 +45,6 @@
#ifndef MSG_TYPES_H
#include <msg_types.h>
#endif
#include <sip_dll.h>
SOFIA_BEGIN_DECLS
......
......@@ -55,8 +55,6 @@
#include <string.h>
#endif
#include <sip_dll.h>
SOFIA_BEGIN_DECLS
/** @internal SIP parser description. */
......
......@@ -36,7 +36,6 @@
* @date Created: Tue Jun 6 17:43:46 2000 ppessi
*/
#include <sip_dll.h>
#include <su_config.h>
SOFIA_BEGIN_DECLS
......
......@@ -51,7 +51,6 @@
#ifndef SIP_H
#include <sip.h>
#endif
#include <sip_dll.h>
SOFIA_BEGIN_DECLS
......
......@@ -37,9 +37,8 @@
#include <su_configure.h>
#define SU_DLL
#if defined(__GNUC__)
/* Special attributes for GNU C */
#if __GNUC__ < 3 && (!defined(__GNUC_MINOR__) || __GNUC_MINOR__ < 96)
#define __malloc__ /* avoid spurious warnigns */
#endif
......@@ -49,11 +48,65 @@
/* C++ linkage needs to know that types and declarations are C, not C++. */
#if defined(__cplusplus)
/** Begin declarations in Sofia header files */
# define SOFIA_BEGIN_DECLS extern "C" {
/** End declarations in Sofia header files */
# define SOFIA_END_DECLS }
#else
# define SOFIA_BEGIN_DECLS
# define SOFIA_END_DECLS
#endif
/* ---------------------------------------------------------------------- */
/* Macros required by Win32 linkage */
/** SOFIAPUBFUN declares an exported function */
#define SOFIAPUBFUN
/** SOFIAPUBVAR declares an exported variable */
#define SOFIAPUBVAR extern
/** SOFIACALL declares the calling convention for exported functions */
#define SOFIACALL
/* Win32 linkage */
/* Windows platform with MS/Borland/Cygwin/MinGW32 compiler */
#if defined(_WIN32) && \
(defined(_MSC_VER) || defined(__BORLANDC__) || \
defined(__CYGWIN__) || defined(__MINGW32__))
#undef SOFIAPUBFUN
#undef SOFIAPUBVAR
#undef SOFIACALL
#if defined(IN_LIBSOFIA_SIP_UA) && !defined(LIBSOFIA_SIP_UA_STATIC)
#define SOFIAPUBFUN __declspec(dllexport)
#define SOFIAPUBVAR __declspec(dllexport)
#else
#if !defined(LIBSOFIA_SIP_UA_STATIC)
#define SOFIAPUBFUN __declspec(dllimport)
#define SOFIAPUBVAR __declspec(dllimport) extern
#else
#define SOFIAPUBFUN
#define SOFIAPUBVAR extern
#endif
#endif
#define SOFIACALL __cdecl
#if !defined _REENTRANT
#define _REENTRANT
#endif
#endif
#define BNF_DLL SOFIAPUBFUN
#define HTTP_DLL SOFIAPUBFUN
#define IPT_DLL SOFIAPUBFUN
#define AUTH_DLL SOFIAPUBFUN
#define MSG_DLL SOFIAPUBFUN
#define NEA_DLL SOFIAPUBFUN
#define NTA_DLL SOFIAPUBFUN
#define NTH_DLL SOFIAPUBFUN
#define SDP_DLL SOFIAPUBFUN
#define SIP_DLL SOFIAPUBFUN
#define SU_DLL SOFIAPUBFUN
#define TPORT_DLL SOFIAPUBFUN
#define URL_DLL SOFIAPUBFUN
#define MSG_TEST_DLL SOFIAPUBFUN
#endif /* SU_CONFIG_H */
......@@ -33,14 +33,6 @@
* @date Created: Sat Oct 12 18:39:48 2002 ppessi
*/
#ifndef TPORT_DLL
#ifndef WIN32
#define TPORT_DLL
#else
#define TPORT_DLL __declspec(dllimport)
#endif
#endif
#ifndef SU_TAG_H
#include <su_tag.h>
#endif
......
......@@ -20,7 +20,7 @@ noinst_PROGRAMS = torture_url test_urlmap
BUILT_SOURCES = url_tag_ref.c
include_sofia_HEADERS = url.h url_dll.h url_tag.h url_tag_class.h
include_sofia_HEADERS = url.h url_tag.h url_tag_class.h
liburl_la_SOURCES = url.c url_tag.c url_tag_ref.c
......
......@@ -99,10 +99,6 @@ typedef union {
#endif
#ifndef URL_DLL
#include <url_dll.h>
#endif
#ifndef URL_H /** Defined when url.h has been included. */
#define URL_H
......
/*
* This file is part of the Sofia-SIP package
*
* Copyright (C) 2005 Nokia Corporation.
*
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef URL_DLL_H /** Defined when url_dll.h has been included. */
#define URL_DLL_H
/**@file url_dll.h
* Define declaration specification for exporting things from @b url.dll.
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*
* @date Created: Thu Jan 30 12:36:06 2003 ppessi
*
*/
#ifndef URL_DLL
#ifndef WIN32
#define URL_DLL
#else
#define URL_DLL __declspec(dllimport)
#endif
#endif
#endif /* !defined URL_DLL_H */
......@@ -42,8 +42,6 @@
#include <su_tag_class.h>
#endif
#include <url_dll.h>
SOFIA_BEGIN_DECLS
URL_DLL extern tag_class_t url_tag_class[1];
......
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