callbacks.h   callbacks.h 
skipping to change at line 45 skipping to change at line 45
* *
*/ */
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef memcached_return_t (*memcached_execute_fn)(const memcached_st *ptr, memcached_result_st *result, void *context); typedef memcached_return_t (*memcached_execute_fn)(const memcached_st *ptr, memcached_result_st *result, void *context);
typedef memcached_return_t (*memcached_server_fn)(const memcached_st *ptr, typedef memcached_return_t (*memcached_server_fn)(const memcached_st *ptr,
memcached_server_instance_st server, void *context); const memcached_instance_st * server, void *context);
typedef memcached_return_t (*memcached_stat_fn)(memcached_server_instance_s typedef memcached_return_t (*memcached_stat_fn)(const memcached_instance_st
t server, * server,
const char *key, size_t key _length, const char *key, size_t key _length,
const char *value, size_t v alue_length, const char *value, size_t v alue_length,
void *context); void *context);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
4 lines changed or deleted 4 lines changed or added


 error.h   error.h 
skipping to change at line 60 skipping to change at line 60
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_error_print(const memcached_st *); void memcached_error_print(const memcached_st *);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_last_error(const memcached_st *); memcached_return_t memcached_last_error(const memcached_st *);
LIBMEMCACHED_API LIBMEMCACHED_API
int memcached_last_error_errno(const memcached_st *); int memcached_last_error_errno(const memcached_st *);
LIBMEMCACHED_API LIBMEMCACHED_API
const char *memcached_server_error(const memcached_server_instance_st ptr ); const char *memcached_server_error(const memcached_instance_st * ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_error_return(const memcached_server_i nstance_st ptr); memcached_return_t memcached_server_error_return(const memcached_instance _st * ptr);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 pid.h   pid.h 
skipping to change at line 39 skipping to change at line 39
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
#ifndef WIN32 #ifndef _WIN32
#include <netdb.h> # include <netdb.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
pid_t libmemcached_util_getpid(const char *hostname, in_port_t port, memcac hed_return_t *ret); pid_t libmemcached_util_getpid(const char *hostname, in_port_t port, memcac hed_return_t *ret);
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 platform.h   platform.h 
skipping to change at line 40 skipping to change at line 40
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
#if defined(WIN32) || defined(__MINGW32__) #if defined(_WIN32)
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
#ifndef HAVE_IN_PORT_T #ifndef HAVE_IN_PORT_T
typedef int in_port_t; typedef int in_port_t;
# define HAVE_IN_PORT_T 1 # define HAVE_IN_PORT_T 1
#endif #endif
typedef SOCKET memcached_socket_t; typedef SOCKET memcached_socket_t;
#else #else
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
# include <arpa/inet.h> # include <arpa/inet.h>
# include <netdb.h> # include <netdb.h>
# include <sys/un.h> # include <sys/un.h>
# include <netinet/tcp.h> # include <netinet/tcp.h>
typedef int memcached_socket_t; typedef int memcached_socket_t;
#endif /* WIN32 */ #endif /* _WIN32 */
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 server.h   server.h 
skipping to change at line 53 skipping to change at line 53
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_cursor(const memcached_st *ptr, memcached_return_t memcached_server_cursor(const memcached_st *ptr,
const memcached_server_fn *callb ack, const memcached_server_fn *callb ack,
void *context, void *context,
uint32_t number_of_callbacks); uint32_t number_of_callbacks);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr, const memcached_instance_st * memcached_server_by_key(memcached_st *ptr,
const char *key, const char *key,
size_t key_length, size_t key_length,
memcached_return_t * error); memcached_return_t * error);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_server_error_reset(memcached_server_st *ptr); void memcached_server_error_reset(memcached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_server_free(memcached_server_st *ptr); void memcached_server_free(memcached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_instance_st memcached_server_get_last_disconnect(const mem cached_st *ptr); const memcached_instance_st * memcached_server_get_last_disconnect(const me mcached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_udp(memcached_st *ptr, memcached_return_t memcached_server_add_udp(memcached_st *ptr,
const char *hostname, const char *hostname,
in_port_t port); in_port_t port);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr,
const char *filename); const char *filename);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add(memcached_st *ptr, memcached_return_t memcached_server_add(memcached_st *ptr,
skipping to change at line 96 skipping to change at line 96
uint32_t we ight); uint32_t we ight);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, cons t char *hostname, memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, cons t char *hostname,
in_port_t port, in_port_t port,
uint32_t weight); uint32_t weight);
/** /**
Operations on Single Servers. Operations on Single Servers.
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
uint32_t memcached_server_response_count(const memcached_server_instance_st self); uint32_t memcached_server_response_count(const memcached_instance_st * self );
LIBMEMCACHED_API LIBMEMCACHED_API
const char *memcached_server_name(const memcached_server_instance_st self); const char *memcached_server_name(const memcached_instance_st * self);
LIBMEMCACHED_API LIBMEMCACHED_API
in_port_t memcached_server_port(const memcached_server_instance_st self); in_port_t memcached_server_port(const memcached_instance_st * self);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time); void memcached_instance_next_retry(const memcached_instance_st * self, cons t time_t absolute_time);
LIBMEMCACHED_API LIBMEMCACHED_API
const char *memcached_server_type(const memcached_server_instance_st ptr); const char *memcached_server_type(const memcached_instance_st * ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
uint8_t memcached_server_major_version(const memcached_server_instance_st p tr); uint8_t memcached_server_major_version(const memcached_instance_st * ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
uint8_t memcached_server_minor_version(const memcached_server_instance_st p tr); uint8_t memcached_server_minor_version(const memcached_instance_st * ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
uint8_t memcached_server_micro_version(const memcached_server_instance_st p tr); uint8_t memcached_server_micro_version(const memcached_instance_st * ptr);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
 End of changes. 10 change blocks. 
10 lines changed or deleted 10 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/