Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added support for SmartOS builds.

Change-Id: I9a826b97b07e66a6b41d85e432aa9090ad050564
Reviewed-on: http://review.couchbase.org/33787
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Brett Lawson <brett19@gmail.com>
  • Loading branch information...
commit c8ccc9f078b5a34df594773ded957b88a5c860a5 1 parent 855965f
@brett19 brett19 authored
View
261 deps/lcb/gyp_config/solaris/ia32/config.h
@@ -0,0 +1,261 @@
+/* src/config.h. Generated from config.h.in by configure. */
+/* src/config.h.in. Generated from configure.ac by autoheader. */
+
+
+#if defined(_WIN32) && !defined(HAVE_CONFIG_H)
+ /* skip config.h contents on a non-autotools win32 build */
+ #include "win32/config.h"
+ #define CONFIG_H
+#endif
+
+#ifndef CONFIG_H
+#define CONFIG_H
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2010, 2011 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This file is generated by running configure. Any changes you make to this
+ * file will be overwritten the next time you run configure. If you want to
+ * make permanent changes to the file you should edit configure.ac instead.
+ * All platform-specific includes should be placed inside config_static.h
+ * to keep the config.h as small as possible. That allows us for easily
+ * use another build systems with a poor support for automake (like Windows)
+ *
+ * @author Trond Norbye
+ */
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Build plugins */
+/* #undef BUILD_PLUGINS */
+
+/* gcov enabled */
+/* #undef ENABLE_GCOV */
+
+/* tcov enabled */
+/* #undef ENABLE_TCOV */
+
+/* Define to 1 if you have the `alarm' function. */
+#define HAVE_ALARM 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* We have CouchbaseMock.jar */
+/* #undef HAVE_COUCHBASEMOCK */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Enables SystemTap / DTrace Support */
+/* #undef HAVE_DTRACE */
+
+/* Define to 1 if you have the <event.h> header file. */
+/* #undef HAVE_EVENT_H */
+
+/* Define to 1 if you have the <ev.h> header file. */
+/* #undef HAVE_EV_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `gethrtime' function. */
+#define HAVE_GETHRTIME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Have ntohll */
+/* #undef HAVE_HTONLL */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* I will build libcouchbase_debug.so */
+/* #undef HAVE_LIBCOUCHBASE_DEBUG */
+
+/* We have libev3 */
+/* #undef HAVE_LIBEV3 */
+
+/* We have libev4 */
+/* #undef HAVE_LIBEV4 */
+
+/* We have libevent */
+/* #undef HAVE_LIBEVENT */
+
+/* We have libevent2 */
+/* #undef HAVE_LIBEVENT2 */
+
+/* Have non-standard place for libev header */
+/* #undef HAVE_LIBEV_EV_H */
+
+/* We have libuv */
+/* #undef HAVE_LIBUV */
+
+/* Define to 1 if you have the `xnet' library (-lxnet). */
+/* #undef HAVE_LIBXNET */
+
+/* We have libyajl2 */
+/* #undef HAVE_LIBYAJL2 */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+/* #undef HAVE_MACH_MACH_TIME_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `QueryPerformanceCounter' function. */
+/* #undef HAVE_QUERYPERFORMANCECOUNTER */
+
+/* Define to 1 if you have the `setitimer' function. */
+#define HAVE_SETITIMER 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/sdt.h> header file. */
+/* #undef HAVE_SYS_SDT_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Name of package */
+#define PACKAGE "libcouchbase"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "support@couchbase.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libcouchbase"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libcouchbase 2.1.3_54_gb4bc0fb"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libcouchbase"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.1.3_54_gb4bc0fb"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Defined for systems where EAGAIN != EWOULDBLOCK */
+/* #undef USE_EAGAIN */
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
+#define VERSION "2.1.3_54_gb4bc0fb"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+
+#include "config_static.h"
+#endif
+
View
77 deps/lcb/gyp_config/solaris/ia32/libcouchbase/configuration.h
@@ -0,0 +1,77 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2010-2012 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Settings detected at "configure" time that the source needs to be
+ * aware of (on the client installation).
+ *
+ * @author Trond Norbye
+ */
+#ifndef LIBCOUCHBASE_CONFIGURATION_H
+#define LIBCOUCHBASE_CONFIGURATION_H 1
+
+#ifndef LIBCOUCHBASE_COUCHBASE_H
+#error "Include libcouchbase/couchbase.h instead"
+#endif
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <time.h>
+
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <stddef.h>
+#endif
+
+#define LCB_VERSION_STRING "2.1.3"
+#define LCB_VERSION 0x020103
+#define LCB_VERSION_CHANGESET "b4bc0fb0d80e80d6de72487acc47c92642ebad0b"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _WIN32
+ typedef __int64 lcb_int64_t;
+ typedef __int32 lcb_int32_t;
+ typedef unsigned long lcb_size_t;
+ typedef long lcb_ssize_t;
+ typedef unsigned __int8 lcb_uint8_t;
+ typedef unsigned __int16 lcb_vbucket_t;
+ typedef unsigned __int16 lcb_uint16_t;
+ typedef unsigned __int32 lcb_uint32_t;
+ typedef unsigned __int64 lcb_cas_t;
+ typedef unsigned __int64 lcb_uint64_t;
+ typedef time_t lcb_time_t;
+#else
+ typedef int64_t lcb_int64_t;
+ typedef int32_t lcb_int32_t;
+ typedef size_t lcb_size_t;
+ typedef ssize_t lcb_ssize_t;
+ typedef uint16_t lcb_vbucket_t;
+ typedef uint8_t lcb_uint8_t;
+ typedef uint16_t lcb_uint16_t;
+ typedef uint32_t lcb_uint32_t;
+ typedef uint64_t lcb_cas_t;
+ typedef uint64_t lcb_uint64_t;
+ typedef time_t lcb_time_t;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
View
261 deps/lcb/gyp_config/solaris/x64/config.h
@@ -0,0 +1,261 @@
+/* src/config.h. Generated from config.h.in by configure. */
+/* src/config.h.in. Generated from configure.ac by autoheader. */
+
+
+#if defined(_WIN32) && !defined(HAVE_CONFIG_H)
+ /* skip config.h contents on a non-autotools win32 build */
+ #include "win32/config.h"
+ #define CONFIG_H
+#endif
+
+#ifndef CONFIG_H
+#define CONFIG_H
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2010, 2011 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This file is generated by running configure. Any changes you make to this
+ * file will be overwritten the next time you run configure. If you want to
+ * make permanent changes to the file you should edit configure.ac instead.
+ * All platform-specific includes should be placed inside config_static.h
+ * to keep the config.h as small as possible. That allows us for easily
+ * use another build systems with a poor support for automake (like Windows)
+ *
+ * @author Trond Norbye
+ */
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Build plugins */
+/* #undef BUILD_PLUGINS */
+
+/* gcov enabled */
+/* #undef ENABLE_GCOV */
+
+/* tcov enabled */
+/* #undef ENABLE_TCOV */
+
+/* Define to 1 if you have the `alarm' function. */
+#define HAVE_ALARM 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* We have CouchbaseMock.jar */
+/* #undef HAVE_COUCHBASEMOCK */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Enables SystemTap / DTrace Support */
+/* #undef HAVE_DTRACE */
+
+/* Define to 1 if you have the <event.h> header file. */
+/* #undef HAVE_EVENT_H */
+
+/* Define to 1 if you have the <ev.h> header file. */
+/* #undef HAVE_EV_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `gethrtime' function. */
+#define HAVE_GETHRTIME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Have ntohll */
+/* #undef HAVE_HTONLL */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* I will build libcouchbase_debug.so */
+/* #undef HAVE_LIBCOUCHBASE_DEBUG */
+
+/* We have libev3 */
+/* #undef HAVE_LIBEV3 */
+
+/* We have libev4 */
+/* #undef HAVE_LIBEV4 */
+
+/* We have libevent */
+/* #undef HAVE_LIBEVENT */
+
+/* We have libevent2 */
+/* #undef HAVE_LIBEVENT2 */
+
+/* Have non-standard place for libev header */
+/* #undef HAVE_LIBEV_EV_H */
+
+/* We have libuv */
+/* #undef HAVE_LIBUV */
+
+/* Define to 1 if you have the `xnet' library (-lxnet). */
+/* #undef HAVE_LIBXNET */
+
+/* We have libyajl2 */
+/* #undef HAVE_LIBYAJL2 */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+/* #undef HAVE_MACH_MACH_TIME_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `QueryPerformanceCounter' function. */
+/* #undef HAVE_QUERYPERFORMANCECOUNTER */
+
+/* Define to 1 if you have the `setitimer' function. */
+#define HAVE_SETITIMER 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/sdt.h> header file. */
+/* #undef HAVE_SYS_SDT_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Name of package */
+#define PACKAGE "libcouchbase"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "support@couchbase.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libcouchbase"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libcouchbase 2.1.3_54_gb4bc0fb"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libcouchbase"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.1.3_54_gb4bc0fb"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Defined for systems where EAGAIN != EWOULDBLOCK */
+/* #undef USE_EAGAIN */
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
+#define VERSION "2.1.3_54_gb4bc0fb"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+
+#include "config_static.h"
+#endif
+
View
77 deps/lcb/gyp_config/solaris/x64/libcouchbase/configuration.h
@@ -0,0 +1,77 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2010-2012 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Settings detected at "configure" time that the source needs to be
+ * aware of (on the client installation).
+ *
+ * @author Trond Norbye
+ */
+#ifndef LIBCOUCHBASE_CONFIGURATION_H
+#define LIBCOUCHBASE_CONFIGURATION_H 1
+
+#ifndef LIBCOUCHBASE_COUCHBASE_H
+#error "Include libcouchbase/couchbase.h instead"
+#endif
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <time.h>
+
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <stddef.h>
+#endif
+
+#define LCB_VERSION_STRING "2.1.3"
+#define LCB_VERSION 0x020103
+#define LCB_VERSION_CHANGESET "b4bc0fb0d80e80d6de72487acc47c92642ebad0b"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _WIN32
+ typedef __int64 lcb_int64_t;
+ typedef __int32 lcb_int32_t;
+ typedef unsigned long lcb_size_t;
+ typedef long lcb_ssize_t;
+ typedef unsigned __int8 lcb_uint8_t;
+ typedef unsigned __int16 lcb_vbucket_t;
+ typedef unsigned __int16 lcb_uint16_t;
+ typedef unsigned __int32 lcb_uint32_t;
+ typedef unsigned __int64 lcb_cas_t;
+ typedef unsigned __int64 lcb_uint64_t;
+ typedef time_t lcb_time_t;
+#else
+ typedef int64_t lcb_int64_t;
+ typedef int32_t lcb_int32_t;
+ typedef size_t lcb_size_t;
+ typedef ssize_t lcb_ssize_t;
+ typedef uint16_t lcb_vbucket_t;
+ typedef uint8_t lcb_uint8_t;
+ typedef uint16_t lcb_uint16_t;
+ typedef uint32_t lcb_uint32_t;
+ typedef uint64_t lcb_cas_t;
+ typedef uint64_t lcb_uint64_t;
+ typedef time_t lcb_time_t;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
View
4 src/cookie.cc
@@ -52,7 +52,7 @@ void Cookie::addSpooledInfo(Handle<Value>& ec, ResponseInfo& info)
}
if (!ec->IsUndefined()) {
- info.setField(NameMap::ERR, ec);
+ info.setField(NameMap::ERRORED, ec);
}
NanPersistentToLocal(spooledInfo)->ForceSet(info.getKey(), payload);
@@ -216,7 +216,7 @@ void HttpCookie::update(lcb_error_t err, const lcb_http_resp_t *resp)
Number::New(resp->v.v0.status));
if (err != LCB_SUCCESS) {
- payload->ForceSet(NameMap::get(NameMap::ERR), errObj);
+ payload->ForceSet(NameMap::get(NameMap::ERRORED), errObj);
}
if (resp->v.v0.nbytes) {
View
2  src/cookie.h
@@ -52,7 +52,7 @@ class ResponseInfo {
}
void setError(lcb_error_t err) {
- setField(NameMap::ERR, CBExc().eLcb(err).asValue());
+ setField(NameMap::ERRORED, CBExc().eLcb(err).asValue());
}
~ResponseInfo() {
View
5 src/couchbase_impl.cc
@@ -388,7 +388,10 @@ Handle<Value> CouchbaseImpl::makeOperation(_NAN_METHOD_ARGS, T &op)
Cookie *cc = op.createCookie();
cc->setParent(args.This());
- if (!me->connected) {
+ if (me->isShutdown) {
+ cc->cancel(LCB_EBADHANDLE, op.getKeyList());
+ return scope.Close(v8::False());
+ } else if (!me->connected) {
// Schedule..
Command *cp = op.makePersistent();
me->pendingCommands.push(cp);
View
2  src/namemap.cc
@@ -41,7 +41,7 @@ void NameMap::initialize()
install("replicate_to", REPLICATE_TO);
install("timeout", TIMEOUT);
install("spooled", SPOOLED);
- install("error", ERR);
+ install("error", ERRORED);
install("is_delete", IS_DELETE);
install("ttp", OBS_TTP);
View
2  src/namemap.h
@@ -49,7 +49,7 @@ namespace Couchnode
TIMEOUT,
SPOOLED,
IS_DELETE,
- ERR,
+ ERRORED,
OBS_TTP,
OBS_TTR,
OBS_CODE,
Please sign in to comment.
Something went wrong with that request. Please try again.