Index: third-party/macosx-libevent-event-config.h =================================================================== --- third-party/macosx-libevent-event-config.h (revision 5107) +++ third-party/macosx-libevent-event-config.h (working copy) @@ -122,12 +122,12 @@ /* Define to 1 if you have the `strsep' function. */ #define _EVENT_HAVE_STRSEP 1 -/* Define to 1 if you have the `strtoll' function. */ -#define HAVE_STRTOLL 1 - /* Define to 1 if you have the `strtok_r' function. */ #define _EVENT_HAVE_STRTOK_R 1 +/* Define to 1 if you have the `strtoll' function. */ +#define _EVENT_HAVE_STRTOLL 1 + /* Define to 1 if the system has the type `struct in6_addr'. */ #define _EVENT_HAVE_STRUCT_IN6_ADDR 1 @@ -143,6 +143,9 @@ /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_PARAM_H 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_SYS_QUEUE_H 1 @@ -176,6 +179,18 @@ /* Define if timerisset is defined in */ #define _EVENT_HAVE_TIMERISSET 1 +/* Define to 1 if the system has the type `uint16_t'. */ +#define _EVENT_HAVE_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define _EVENT_HAVE_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define _EVENT_HAVE_UINT64_T 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define _EVENT_HAVE_UINT8_T 1 + /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_UNISTD_H 1 @@ -203,6 +218,18 @@ /* Define to the version of this package. */ #define _EVENT_PACKAGE_VERSION "" +/* The size of `int', as computed by sizeof. */ +#define _EVENT_SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define _EVENT_SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define _EVENT_SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define _EVENT_SIZEOF_SHORT 2 + /* Define to 1 if you have the ANSI C header files. */ #define _EVENT_STDC_HEADERS 1 @@ -210,7 +237,7 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define _EVENT_VERSION "1.3.99-trunk" +#define _EVENT_VERSION "1.4.1-beta" /* Define to appropriate substitue if compiler doesnt have __func__ */ /* #undef _EVENT___func__ */ @@ -232,16 +259,4 @@ /* Define to unsigned int if you dont have it */ /* #undef _EVENT_socklen_t */ - -/* Define to `unsigned short' if does not define. */ -/* #undef _EVENT_uint16_t */ - -/* Define to `unsigned int' if does not define. */ -/* #undef _EVENT_uint32_t */ - -/* Define to `unsigned long long' if does not define. */ -/* #undef _EVENT_uint64_t */ - -/* Define to `unsigned char' if does not define. */ -/* #undef _EVENT_uint8_t */ #endif Index: third-party/macosx-libevent-config.h =================================================================== --- third-party/macosx-libevent-config.h (revision 5107) +++ third-party/macosx-libevent-config.h (working copy) @@ -1,85 +1,6 @@ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if kqueue works correctly with pipes */ -#define HAVE_WORKING_KQUEUE 1 -/* Define to `unsigned long long' if doesn't define. */ -/* #undef u_int64_t */ - -/* Define to `unsigned int' if doesn't define. */ -/* #undef u_int32_t */ - -/* Define to `unsigned short' if doesn't define. */ -/* #undef u_int16_t */ - -/* Define to `unsigned char' if doesn't define. */ -/* #undef u_int8_t */ - -/* Define if timeradd is defined in */ -#define HAVE_TIMERADD 1 -#ifndef HAVE_TIMERADD -/* #undef timersub */ -#define timeradd(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) -#define timersub(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ - } while (0) -#endif /* !HAVE_TIMERADD */ - -#define HAVE_TIMERCLEAR 1 -#ifndef HAVE_TIMERCLEAR -#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 -#endif - -#define HAVE_TIMERCMP 1 -#ifndef HAVE_TIMERCMP -/* #undef timercmp */ -#define timercmp(tvp, uvp, cmp) \ - (((tvp)->tv_sec == (uvp)->tv_sec) ? \ - ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ - ((tvp)->tv_sec cmp (uvp)->tv_sec)) -#endif - -#define HAVE_TIMERISSET 1 -#ifndef HAVE_TIMERISSET -/* #undef timerisset */ -#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) -#endif - -/* Define if TAILQ_FOREACH is defined in */ -#define HAVE_TAILQFOREACH 1 -#ifndef HAVE_TAILQFOREACH -#define TAILQ_FIRST(head) ((head)->tqh_first) -#define TAILQ_END(head) NULL -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) -#define TAILQ_FOREACH(var, head, field) \ - for((var) = TAILQ_FIRST(head); \ - (var) != TAILQ_END(head); \ - (var) = TAILQ_NEXT(var, field)) -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - (elm)->field.tqe_next = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ -} while (0) -#endif /* TAILQ_FOREACH */ - -/* Define to __FUNCTION__ or __file__ if your compiler doesn't have __func__ */ -/* #undef __func__ */ - /* Define if clock_gettime is available in libc */ /* #undef DNS_USE_CPU_CLOCK_FOR_ID */ @@ -158,9 +79,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_PORT_H */ -/* Define if your system supports POSIX realtime signals */ -/* #undef HAVE_RTSIG */ - /* Define to 1 if you have the `select' function. */ #define HAVE_SELECT 1 @@ -176,9 +94,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define to 1 if you have the `sigtimedwait' function. */ -/* #undef HAVE_SIGTIMEDWAIT */ - /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 @@ -200,12 +115,12 @@ /* Define to 1 if you have the `strsep' function. */ #define HAVE_STRSEP 1 -/* Define to 1 if you have the `strtoll' function. */ -#define HAVE_STRTOLL 1 - /* Define to 1 if you have the `strtok_r' function. */ #define HAVE_STRTOK_R 1 +/* Define to 1 if you have the `strtoll' function. */ +#define HAVE_STRTOLL 1 + /* Define to 1 if the system has the type `struct in6_addr'. */ #define HAVE_STRUCT_IN6_ADDR 1 @@ -221,6 +136,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_QUEUE_H 1 @@ -254,6 +172,18 @@ /* Define if timerisset is defined in */ #define HAVE_TIMERISSET 1 +/* Define to 1 if the system has the type `uint16_t'. */ +#define HAVE_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define HAVE_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define HAVE_UINT64_T 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define HAVE_UINT8_T 1 + /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 @@ -263,9 +193,6 @@ /* Define if kqueue works correctly with pipes */ #define HAVE_WORKING_KQUEUE 1 -/* Define if realtime signals work on pipes */ -/* #undef HAVE_WORKING_RTSIG */ - /* Name of package */ #define PACKAGE "libevent" @@ -284,6 +211,18 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "" +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -291,7 +230,7 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "1.3.99-trunk" +#define VERSION "1.4.1-beta" /* Define to appropriate substitue if compiler doesnt have __func__ */ /* #undef __func__ */ @@ -308,20 +247,8 @@ /* Define to `int' if does not define. */ /* #undef pid_t */ -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ /* Define to unsigned int if you dont have it */ /* #undef socklen_t */ - -/* Define to `unsigned short' if does not define. */ -/* #undef uint16_t */ - -/* Define to `unsigned int' if does not define. */ -/* #undef uint32_t */ - -/* Define to `unsigned long long' if does not define. */ -/* #undef uint64_t */ - -/* Define to `unsigned char' if does not define. */ -/* #undef uint8_t */