| 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 | |||
| #ifdef WIN32 | #if defined(WIN32) || defined(__MINGW32__) | |||
| # include <winsock2.h> | ||||
| # include <ws2tcpip.h> | ||||
| #include <winsock2.h> | ||||
| #include <ws2tcpip.h> | ||||
| typedef short in_port_t; | typedef short in_port_t; | |||
| typedef SOCKET memcached_socket_t; | typedef SOCKET memcached_socket_t; | |||
| #else | #else | |||
| # include <sys/socket.h> | ||||
| # include <netinet/in.h> | ||||
| # include <arpa/inet.h> | ||||
| # include <netdb.h> | ||||
| # include <sys/un.h> | ||||
| # include <netinet/tcp.h> | ||||
| typedef int memcached_socket_t; | typedef int memcached_socket_t; | |||
| #include <sys/socket.h> | ||||
| #include <netinet/in.h> | ||||
| #include <arpa/inet.h> | ||||
| #include <netdb.h> | ||||
| #include <sys/un.h> | ||||
| #include <netinet/tcp.h> | ||||
| #endif /* WIN32 */ | #endif /* WIN32 */ | |||
| End of changes. 5 change blocks. | ||||
| 9 lines changed or deleted | 11 lines changed or added | |||
| return.h | return.h | |||
|---|---|---|---|---|
| skipping to change at line 66 | skipping to change at line 66 | |||
| rc != MEMCACHED_STAT && | rc != MEMCACHED_STAT && | |||
| rc != MEMCACHED_DELETED && | rc != MEMCACHED_DELETED && | |||
| rc != MEMCACHED_BUFFERED && | rc != MEMCACHED_BUFFERED && | |||
| rc != MEMCACHED_VALUE); | rc != MEMCACHED_VALUE); | |||
| } | } | |||
| static inline bool memcached_fatal(memcached_return_t rc) | static inline bool memcached_fatal(memcached_return_t rc) | |||
| { | { | |||
| return ( | return ( | |||
| rc != MEMCACHED_BUFFERED && | rc != MEMCACHED_BUFFERED && | |||
| rc != MEMCACHED_CLIENT_ERROR && | ||||
| rc != MEMCACHED_DATA_EXISTS && | rc != MEMCACHED_DATA_EXISTS && | |||
| rc != MEMCACHED_DELETED && | rc != MEMCACHED_DELETED && | |||
| rc != MEMCACHED_E2BIG && | rc != MEMCACHED_E2BIG && | |||
| rc != MEMCACHED_END && | rc != MEMCACHED_END && | |||
| rc != MEMCACHED_ITEM && | rc != MEMCACHED_ITEM && | |||
| rc != MEMCACHED_ERROR && | rc != MEMCACHED_ERROR && | |||
| rc != MEMCACHED_NOTFOUND && | rc != MEMCACHED_NOTFOUND && | |||
| rc != MEMCACHED_NOTSTORED && | rc != MEMCACHED_NOTSTORED && | |||
| rc != MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE && | rc != MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE && | |||
| rc != MEMCACHED_STAT && | rc != MEMCACHED_STAT && | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 1 lines changed or added | |||