Merge pull request #184 from jimdigriz/disable-sockets

fix --disable-sockets

Author: sustrik

CMakeLists.txt

@@ -108,6 +108,7 @@ set(CMAKE_REQUIRED_LIBRARIES )
 set(CMAKE_REQUIRED_DEFINITIONS )
 
 add_definitions(-DDILL_THREADS)
+add_definitions(-DDILL_SOCKETS)
 
 check_function_exists(mprotect HAVE_MPROTECT)
 if(HAVE_MPROTECT)

configure.ac

@@ -145,6 +145,7 @@ AC_ARG_ENABLE([sockets], [AS_HELP_STRING([--disable-sockets],
 if test "x$enable_sockets" = "xno"; then
     AM_CONDITIONAL([DILL_SOCKETS], false)
 else
+    AC_DEFINE(DILL_SOCKETS)
     AM_CONDITIONAL([DILL_SOCKETS], true)
 fi
 

ctx.c

@@ -35,13 +35,17 @@ static void dill_ctx_init_(struct dill_ctx *ctx) {
     dill_assert(rc == 0);
     rc = dill_ctx_pollset_init(&ctx->pollset);
     dill_assert(rc == 0);
+#if defined DILL_SOCKETS
     rc = dill_ctx_fd_init(&ctx->fd);
     dill_assert(rc == 0);
+#endif
 }
 
 static void dill_ctx_term_(struct dill_ctx *ctx) {
     dill_assert(ctx->initialized == 1);
+#if defined DILL_SOCKETS
     dill_ctx_fd_term(&ctx->fd);
+#endif
     dill_ctx_pollset_term(&ctx->pollset);
     dill_ctx_stack_term(&ctx->stack);
     dill_ctx_handle_term(&ctx->handle);

ctx.h

@@ -37,7 +37,9 @@ struct dill_ctx {
     struct dill_ctx_handle handle;
     struct dill_ctx_stack stack;
     struct dill_ctx_pollset pollset;
+#if defined DILL_SOCKETS
     struct dill_ctx_fd fd;
+#endif
 };
 
 struct dill_ctx *dill_ctx_init(void);

libdill.h

@@ -143,7 +143,7 @@ DILL_EXPORT __attribute__((noinline)) void dill_epilogue(void);
 
 /* Stack-switching on X86-64. */
 #if defined(__x86_64__) && !defined DILL_ARCH_FALLBACK
-#define dill_setjmp(ctx) ({\
+#define dill_setjmp(ctx) __extension__ ({\
     int ret;\
     asm("lea     LJMPRET%=(%%rip), %%rcx\n\t"\
         "xor     %%rax, %%rax\n\t"\
@@ -187,7 +187,7 @@ DILL_EXPORT __attribute__((noinline)) void dill_epilogue(void);
 
 /* Stack switching on X86. */
 #elif defined(__i386__) && !defined DILL_ARCH_FALLBACK
-#define dill_setjmp(ctx) ({\
+#define dill_setjmp(ctx) __extension__ ({\
     int ret;\
     asm("movl   $LJMPRET%=, %%ecx\n\t"\
         "movl   %%ebx, (%%edx)\n\t"\
@@ -240,7 +240,7 @@ DILL_EXPORT __attribute__((noinline)) void dill_epilogue(void);
    get weird values. To avoid that, we use fancy names (dill_*__). */ 
 
 #define dill_go_(fn, ptr, len, bndl) \
-    ({\
+    __extension__ ({\
         sigjmp_buf *dill_ctx__;\
         void *dill_stk__ = (ptr);\
         int dill_handle__ = dill_prologue(&dill_ctx__, &dill_stk__, (len),\