denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed all static clone() functions to avoid naming conflicts with uclibc

Browse Source
This commit is contained in:
Martin Willi
2007-02-01 15:24:10 +00:00
parent 42dcd01ffe
commit d3032a9a82
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/host.c
+2 -2
View File
@@ -248,7 +248,7 @@ static void set_port(private_host_t *this, u_int16_t port)
/**
* Implements host_t.clone.
*/
static private_host_t *clone(private_host_t *this)
static private_host_t *clone_(private_host_t *this)
{
private_host_t *new = malloc_thing(private_host_t);
@@ -368,7 +368,7 @@ static private_host_t *host_create_empty(void)
this->public.get_sockaddr = (sockaddr_t* (*) (host_t*))get_sockaddr;
this->public.get_sockaddr_len = (socklen_t*(*) (host_t*))get_sockaddr_len;
this->public.clone = (host_t* (*) (host_t*))clone;
this->public.clone = (host_t* (*) (host_t*))clone_;
this->public.get_family = (int (*) (host_t*))get_family;
this->public.get_address = (chunk_t (*) (host_t *)) get_address;
this->public.get_port = (u_int16_t (*) (host_t *))get_port;
src/libstrongswan/utils/identification.c
+2 -2
View File
@@ -921,7 +921,7 @@ static void __attribute__ ((constructor))print_register()
/**
* Implementation of identification_t.clone.
*/
static identification_t *clone(private_identification_t *this)
static identification_t *clone_(private_identification_t *this)
{
private_identification_t *clone = identification_create();
@@ -952,7 +952,7 @@ static private_identification_t *identification_create(void)
this->public.get_encoding = (chunk_t (*) (identification_t*))get_encoding;
this->public.get_type = (id_type_t (*) (identification_t*))get_type;
this->public.contains_wildcards = (bool (*) (identification_t *this))contains_wildcards;
this->public.clone = (identification_t* (*) (identification_t*))clone;
this->public.clone = (identification_t* (*) (identification_t*))clone_;
this->public.destroy = (void (*) (identification_t*))destroy;
/* we use these as defaults, the may be overloaded for special ID types */
this->public.equals = (bool (*) (identification_t*,identification_t*))equals_binary;