job.h   job.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.
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 result.h   result.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
enum gearman_result_t {
GEARMAN_RESULT_BINARY,
GEARMAN_RESULT_BOOLEAN,
GEARMAN_RESULT_INTEGER
};
#ifndef __cplusplus
typedef enum gearman_result_t gearman_result_t;
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
GEARMAN_API GEARMAN_API
int64_t gearman_result_integer(const gearman_result_st *self); int64_t gearman_result_integer(const gearman_result_st *self);
GEARMAN_API GEARMAN_API
bool gearman_result_boolean(const gearman_result_st *self); bool gearman_result_boolean(const gearman_result_st *self);
GEARMAN_API GEARMAN_API
gearman_string_t gearman_result_string(const gearman_result_st *self); gearman_string_t gearman_result_string(const gearman_result_st *self);
GEARMAN_LOCAL
gearman_string_t gearman_result_take_string(gearman_result_st *self);
GEARMAN_API GEARMAN_API
gearman_return_t gearman_result_store_string(gearman_result_st *self, gea rman_string_t arg); gearman_return_t gearman_result_store_string(gearman_result_st *self, gea rman_string_t arg);
GEARMAN_API GEARMAN_API
void gearman_result_store_integer(gearman_result_st *self, int64_t value) ; void gearman_result_store_integer(gearman_result_st *self, int64_t value) ;
GEARMAN_API GEARMAN_API
gearman_return_t gearman_result_store_value(gearman_result_st *self, cons t void *value, size_t size); gearman_return_t gearman_result_store_value(gearman_result_st *self, cons t void *value, size_t size);
GEARMAN_API GEARMAN_API
 End of changes. 2 change blocks. 
12 lines changed or deleted 0 lines changed or added


 string.h   string.h 
skipping to change at line 52 skipping to change at line 52
const char *c_str; const char *c_str;
const size_t size; const size_t size;
}; };
#define gearman_size(X) (X).size #define gearman_size(X) (X).size
#define gearman_c_str(X) (X).c_str #define gearman_c_str(X) (X).c_str
#define gearman_string_param(X) (X).c_str, (X).size #define gearman_string_param(X) (X).c_str, (X).size
#define gearman_string_param_null NULL, 0 #define gearman_string_param_null NULL, 0
#define gearman_string_param_cstr(X) (X), ((X) ? strlen(X) : 0) #define gearman_string_param_cstr(X) (X), ((X) ? strlen(X) : 0)
#ifdef __cplusplus #ifndef gearman_literal_param
# define gearman_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1) # ifdef __cplusplus
)) # define gearman_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1
# define gearman_literal_param_size(X) static_cast<size_t>(sizeof(X) - 1) )))
# define gearman_literal_param_size(X) static_cast<size_t>(sizeof(X) - 1)
# endif
#endif #endif
#ifdef BUILDING_LIBGEARMAN #ifdef BUILDING_LIBGEARMAN
#ifdef __cplusplus // correct define #ifdef __cplusplus // correct define
#define gearman_string_make(X) (X), size_t((sizeof(X) - 1)) # define gearman_string_make(X) (X), size_t((sizeof(X) - 1))
#else #else
#define gearman_string_make(X) (X), (((size_t)((sizeof(X) - 1))) # define gearman_string_make(X) (X), (((size_t)((sizeof(X) - 1)))
#endif // correct define #endif // correct define
#endif // BUILDING_LIBGEARMAN #endif // BUILDING_LIBGEARMAN
 End of changes. 3 change blocks. 
6 lines changed or deleted 8 lines changed or added


 task.h   task.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.
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 util.h   util.h 
skipping to change at line 53 skipping to change at line 53
GEARMAN_API GEARMAN_API
const char *gearman_version(void); const char *gearman_version(void);
GEARMAN_API GEARMAN_API
const char *gearman_bugreport(void); const char *gearman_bugreport(void);
GEARMAN_API GEARMAN_API
const char *gearman_verbose_name(gearman_verbose_t verbose); const char *gearman_verbose_name(gearman_verbose_t verbose);
#define gearman_timeout(__object) ((__object)->impl()->universal.timeout) #define gearman_timeout(__object) (__object) ? ((__object)->impl()->univers al.timeout) : 0
#define gearman_set_timeout(__object, __value) ((__object)->universal.timeo ut)=(__value); #define gearman_set_timeout(__object, __value) do { if (__object) ((__objec t)->impl()->universal.timeout)=(__value); } while(0);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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.5" #define LIBGEARMAN_VERSION_STRING "1.1.6"
#define LIBGEARMAN_VERSION_HEX 0x01001005 #define LIBGEARMAN_VERSION_HEX 0x01001006
 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/