connection.h   connection.h 
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
* *
* Gearmand client and server library. * Gearmand client and server library.
* *
* Copyright (C) 2011 Data Differential, http://datadifferential.com/ * Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
* Copyright (C) 2008 Brian Aker, Eric Day * Copyright (C) 2008 Brian Aker, Eric Day
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
* met: * met:
* *
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
skipping to change at line 46 skipping to change at line 46
* *
*/ */
#pragma once #pragma once
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#ifdef NI_MAXHOST #ifdef NI_MAXHOST
#define GEARMAN_NI_MAXHOST NI_MAXHOST # define GEARMAN_NI_MAXHOST NI_MAXHOST
#else #else
#define GEARMAN_NI_MAXHOST 1025 # define GEARMAN_NI_MAXHOST 1025
#endif #endif
#ifdef NI_MAXSERV #ifdef NI_MAXSERV
#define GEARMAN_NI_MAXSERV NI_MAXSERV # define GEARMAN_NI_MAXSERV NI_MAXSERV
#else #else
#define GEARMAN_NI_MAXSERV 32 # define GEARMAN_NI_MAXSERV 32
#endif #endif
/* /*
Do not define these enum in your application. There are left publically d ue to one client. Do not define these enum in your application. There are left publically d ue to one client.
*/ */
enum gearman_con_recv_t { enum gearman_con_recv_t {
GEARMAN_CON_RECV_UNIVERSAL_NONE, GEARMAN_CON_RECV_UNIVERSAL_NONE,
GEARMAN_CON_RECV_UNIVERSAL_READ, GEARMAN_CON_RECV_UNIVERSAL_READ,
GEARMAN_CON_RECV_STATE_READ_DATA GEARMAN_CON_RECV_STATE_READ_DATA
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 return.h   return.h 
skipping to change at line 97 skipping to change at line 97
GEARMAN_PIPE_EOF, // DEPRECATED, SERVER ONLY GEARMAN_PIPE_EOF, // DEPRECATED, SERVER ONLY
GEARMAN_QUEUE_ERROR, // DEPRECATED, SERVER ONLY GEARMAN_QUEUE_ERROR, // DEPRECATED, SERVER ONLY
GEARMAN_FLUSH_DATA, // Internal state, should never be seen by either cli ent or worker. GEARMAN_FLUSH_DATA, // Internal state, should never be seen by either cli ent or worker.
GEARMAN_SEND_BUFFER_TOO_SMALL, GEARMAN_SEND_BUFFER_TOO_SMALL,
GEARMAN_IGNORE_PACKET, // Internal only GEARMAN_IGNORE_PACKET, // Internal only
GEARMAN_UNKNOWN_OPTION, // DEPRECATED GEARMAN_UNKNOWN_OPTION, // DEPRECATED
GEARMAN_TIMEOUT, GEARMAN_TIMEOUT,
GEARMAN_ARGUMENT_TOO_LARGE, GEARMAN_ARGUMENT_TOO_LARGE,
GEARMAN_INVALID_ARGUMENT, GEARMAN_INVALID_ARGUMENT,
GEARMAN_IN_PROGRESS, // See gearman_client_job_status() GEARMAN_IN_PROGRESS, // See gearman_client_job_status()
GEARMAN_INVALID_SERVER_OPTION, // Bad server option sent to server
GEARMAN_MAX_RETURN, /* Always add new error code before */ GEARMAN_MAX_RETURN, /* Always add new error code before */
GEARMAN_FAIL= GEARMAN_WORK_FAIL, GEARMAN_FAIL= GEARMAN_WORK_FAIL,
GEARMAN_FATAL= GEARMAN_WORK_FAIL, GEARMAN_FATAL= GEARMAN_WORK_FAIL,
GEARMAN_ERROR= GEARMAN_WORK_ERROR GEARMAN_ERROR= GEARMAN_WORK_ERROR
}; };
static inline bool gearman_continue(enum gearman_return_t rc) static inline bool gearman_continue(enum gearman_return_t rc)
{ {
return rc == GEARMAN_IO_WAIT || rc == GEARMAN_IN_PROGRESS || rc == GEARM AN_PAUSE || rc == GEARMAN_JOB_EXISTS; return rc == GEARMAN_IO_WAIT || rc == GEARMAN_IN_PROGRESS || rc == GEARM AN_PAUSE || rc == GEARMAN_JOB_EXISTS;
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 version.h   version.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
#define LIBGEARMAN_VERSION_STRING "1.1.4" #define LIBGEARMAN_VERSION_STRING "1.1.5"
#define LIBGEARMAN_VERSION_HEX 0x01001004 #define LIBGEARMAN_VERSION_HEX 0x01001005
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 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/