From 4a5431ef115b869ff232d3306711960d8a55678f Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 26 Mar 2008 03:33:43 +0000 Subject: [PATCH] Remove the event-config.h file, it is never used. Correct the include logic that protect the headers. It's amazing that this didn't bite us yet ... This commit was SVN r17971. --- opal/event/event-config.h | 262 -------------------------------------- opal/event/event.h | 6 +- opal/event/evutil.h | 26 ++-- 3 files changed, 16 insertions(+), 278 deletions(-) delete mode 100644 opal/event/event-config.h diff --git a/opal/event/event-config.h b/opal/event/event-config.h deleted file mode 100644 index 4dc7f0fb71..0000000000 --- a/opal/event/event-config.h +++ /dev/null @@ -1,262 +0,0 @@ -/* event-config.h - * Generated by autoconf; post-processed by libevent. - * Do not edit this file. - * Do not rely on macros in this file existing in later versions. - */ -#ifndef _EVENT_CONFIG_H_ -#define _EVENT_CONFIG_H_ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define if clock_gettime is available in libc */ -/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */ - -/* Define is no secure id variant is available */ -#define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef _EVENT_HAVE_CLOCK_GETTIME */ - -/* Define if /dev/poll is available */ -/* #undef _EVENT_HAVE_DEVPOLL */ - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_DLFCN_H 1 - -/* Define if your system supports the epoll system calls */ -/* #undef _EVENT_HAVE_EPOLL */ - -/* Define to 1 if you have the `epoll_ctl' function. */ -/* #undef _EVENT_HAVE_EPOLL_CTL */ - -/* Define if your system supports event ports */ -/* #undef _EVENT_HAVE_EVENT_PORTS */ - -/* Define to 1 if you have the `fcntl' function. */ -#define _EVENT_HAVE_FCNTL 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define _EVENT_HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `getnameinfo' function. */ -#define _EVENT_HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#define _EVENT_HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `inet_ntop' function. */ -#define _EVENT_HAVE_INET_NTOP 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `kqueue' function. */ -#define _EVENT_HAVE_KQUEUE 1 - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef _EVENT_HAVE_LIBNSL */ - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -#define _EVENT_HAVE_LIBRESOLV 1 - -/* Define to 1 if you have the `rt' library (-lrt). */ -/* #undef _EVENT_HAVE_LIBRT */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef _EVENT_HAVE_LIBSOCKET */ - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_NETINET_IN6_H */ - -/* Define to 1 if you have the `poll' function. */ -#define _EVENT_HAVE_POLL 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_POLL_H 1 - -/* Define to 1 if you have the `port_create' function. */ -/* #undef _EVENT_HAVE_PORT_CREATE */ - -/* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_PORT_H */ - -/* Define to 1 if you have the `select' function. */ -#define _EVENT_HAVE_SELECT 1 - -/* Define if F_SETFD is defined in */ -#define _EVENT_HAVE_SETFD 1 - -/* Define to 1 if you have the `sigaction' function. */ -#define _EVENT_HAVE_SIGACTION 1 - -/* Define to 1 if you have the `signal' function. */ -#define _EVENT_HAVE_SIGNAL 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SIGNAL_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_STDARG_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_STRING_H 1 - -/* Define to 1 if you have the `strlcpy' function. */ -#define _EVENT_HAVE_STRLCPY 1 - -/* Define to 1 if you have the `strsep' function. */ -#define _EVENT_HAVE_STRSEP 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 - -/* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef _EVENT_HAVE_SYS_EPOLL_H */ - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_EVENT_H 1 - -/* 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 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define _EVENT_HAVE_SYS_TYPES_H 1 - -/* Define if TAILQ_FOREACH is defined in */ -#define _EVENT_HAVE_TAILQFOREACH 1 - -/* Define if timeradd is defined in */ -#define _EVENT_HAVE_TIMERADD 1 - -/* Define if timerclear is defined in */ -#define _EVENT_HAVE_TIMERCLEAR 1 - -/* Define if timercmp is defined in */ -#define _EVENT_HAVE_TIMERCMP 1 - -/* 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 - -/* Define to 1 if you have the `vasprintf' function. */ -#define _EVENT_HAVE_VASPRINTF 1 - -/* Define if kqueue works correctly with pipes */ -#define _EVENT_HAVE_WORKING_KQUEUE 1 - -/* Name of package */ -#define _EVENT_PACKAGE "libevent" - -/* Define to the address where bug reports for this package should be sent. */ -#define _EVENT_PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define _EVENT_PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define _EVENT_PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define _EVENT_PACKAGE_TARNAME "" - -/* 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 - -/* Define to 1 if you can safely include both and . */ -#define _EVENT_TIME_WITH_SYS_TIME 1 - -/* Version number of package */ -#define _EVENT_VERSION "1.4.2-rc" - -/* Define to appropriate substitue if compiler doesnt have __func__ */ -/* #undef _EVENT___func__ */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef _EVENT_const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef _EVENT___cplusplus -/* #undef _EVENT_inline */ -#endif - -/* Define to `int' if does not define. */ -/* #undef _EVENT_pid_t */ - -/* Define to `unsigned int' if does not define. */ -/* #undef _EVENT_size_t */ - -/* Define to unsigned int if you dont have it */ -/* #undef _EVENT_socklen_t */ -#endif diff --git a/opal/event/event.h b/opal/event/event.h index e07f0c1ad0..b7687d5a4f 100644 --- a/opal/event/event.h +++ b/opal/event/event.h @@ -167,13 +167,13 @@ extern "C" { #endif -#ifdef _EVENT_HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef _EVENT_HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H #include #endif -#ifdef _EVENT_HAVE_STDINT_H +#ifdef HAVE_STDINT_H #include #endif #ifdef HAVE_STDARG_H diff --git a/opal/event/evutil.h b/opal/event/evutil.h index af6e8ec8ad..c34acff6c1 100644 --- a/opal/event/evutil.h +++ b/opal/event/evutil.h @@ -40,19 +40,19 @@ extern "C" { #endif -#ifdef _EVENT_HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H #include #endif -#ifdef _EVENT_HAVE_STDINT_H +#ifdef HAVE_STDINT_H #include -#elif defined(_EVENT_HAVE_INTTYPES_H) +#elif defined(HAVE_INTTYPES_H) #include #endif -#ifdef _EVENT_HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H #include #endif -#ifdef _EVENT_HAVE_UINT64_T +#ifdef HAVE_UINT64_T #define ev_uint64_t uint64_t #define ev_int64_t int64_t #elif defined(WIN32) @@ -68,7 +68,7 @@ extern "C" { #error "No way to define ev_uint64_t" #endif -#ifdef _EVENT_HAVE_UINT32_T +#ifdef HAVE_UINT32_T #define ev_uint32_t uint32_t #elif defined(WIN32) #define ev_uint32_t unsigned int @@ -80,7 +80,7 @@ extern "C" { #error "No way to define ev_uint32_t" #endif -#ifdef _EVENT_HAVE_UINT16_T +#ifdef HAVE_UINT16_T #define ev_uint16_t uint16_t #elif defined(WIN32) #define ev_uint16_t unsigned short @@ -92,7 +92,7 @@ extern "C" { #error "No way to define ev_uint16_t" #endif -#ifdef _EVENT_HAVE_UINT8_T +#ifdef HAVE_UINT8_T #define ev_uint8_t uint8_t #else #define ev_uint8_t unsigned char @@ -120,7 +120,7 @@ OPAL_DECLSPEC int evutil_make_socket_nonblocking(int sock); /* * Manipulation functions for struct timeval */ -#ifdef _EVENT_HAVE_TIMERADD +#ifdef HAVE_TIMERADD #define evutil_timeradd(tvp, uvp, vvp) timeradd((tvp), (uvp), (vvp)) #define evutil_timersub(tvp, uvp, vvp) timersub((tvp), (uvp), (vvp)) #else @@ -142,15 +142,15 @@ OPAL_DECLSPEC int evutil_make_socket_nonblocking(int sock); (vvp)->tv_usec += 1000000; \ } \ } while (0) -#endif /* !_EVENT_HAVE_HAVE_TIMERADD */ +#endif /* !HAVE_HAVE_TIMERADD */ -#ifdef _EVENT_HAVE_TIMERCLEAR +#ifdef HAVE_TIMERCLEAR #define evutil_timerclear(tvp) timerclear(tvp) #else #define evutil_timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 #endif -#ifdef _EVENT_HAVE_TIMERCMP +#ifdef HAVE_TIMERCMP #define evutil_timercmp(tvp, uvp, cmp) timercmp((tvp), (uvp), cmp) #else #define evutil_timercmp(tvp, uvp, cmp) \ @@ -159,7 +159,7 @@ OPAL_DECLSPEC int evutil_make_socket_nonblocking(int sock); ((tvp)->tv_sec cmp (uvp)->tv_sec)) #endif -#ifdef _EVENT_HAVE_TIMERISSET +#ifdef HAVE_TIMERISSET #define evutil_timerisset(tvp) timerisset(tvp) #else #define evutil_timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)