]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
libipsec: Avoid name clash with sched.h clone()
authorMartin Willi <martin@revosec.ch>
Mon, 10 Mar 2014 16:06:57 +0000 (17:06 +0100)
committerMartin Willi <martin@revosec.ch>
Wed, 4 Jun 2014 13:53:01 +0000 (15:53 +0200)
src/libipsec/esp_packet.c
src/libipsec/ip_packet.c

index ebe13ce77550ba340295dcebf1fa0b1f7e0abb20..82230228057a3c7ee7a345bd32db7ff95dc41fb2 100644 (file)
@@ -115,7 +115,7 @@ METHOD(packet_t, skip_bytes, void,
        return this->packet->skip_bytes(this->packet, bytes);
 }
 
-METHOD(packet_t, clone, packet_t*,
+METHOD(packet_t, clone_, packet_t*,
        private_esp_packet_t *this)
 {
        private_esp_packet_t *pkt;
@@ -414,7 +414,7 @@ static private_esp_packet_t *esp_packet_create_internal(packet_t *packet)
                                .get_dscp = _get_dscp,
                                .set_dscp = _set_dscp,
                                .skip_bytes = _skip_bytes,
-                               .clone = _clone,
+                               .clone = _clone_,
                                .destroy = _destroy,
                        },
                        .get_source = _get_source,
index ede9d100a18783273c19ec43e6131131fb2d33d2..181cb88db9c49664308f60263e37f3284dd3d8ad 100644 (file)
@@ -95,7 +95,7 @@ METHOD(ip_packet_t, get_next_header, u_int8_t,
        return this->next_header;
 }
 
-METHOD(ip_packet_t, clone, ip_packet_t*,
+METHOD(ip_packet_t, clone_, ip_packet_t*,
        private_ip_packet_t *this)
 {
        return ip_packet_create(chunk_clone(this->packet));
@@ -183,7 +183,7 @@ ip_packet_t *ip_packet_create(chunk_t packet)
                        .get_destination = _get_destination,
                        .get_next_header = _get_next_header,
                        .get_encoding = _get_encoding,
-                       .clone = _clone,
+                       .clone = _clone_,
                        .destroy = _destroy,
                },
                .src = src,