We do not work any more without an event-config.h; stop pretending that it is meaningful to check for HAVE_CONFIG_H

svn:r1516
2025-09-15 15:25:09 -04:00 · 2009-11-06 21:46:57 +00:00 · 2009-11-06 21:46:57 +00:00 · 784b8773a4
commit 784b8773a4
parent 4d48cf61a2
46 changed files with 6 additions and 99 deletions
--- a/buffer.c
+++ b/buffer.c
@ -25,9 +25,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/bufferevent.c
+++ b/bufferevent.c
@ -27,9 +27,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_filter.c
+++ b/bufferevent_filter.c
@ -28,9 +28,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@ -26,9 +26,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/bufferevent_pair.c
+++ b/bufferevent_pair.c
@ -30,9 +30,7 @@
 #include <winsock2.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include "event2/util.h"
 #include "event2/buffer.h"
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@ -28,9 +28,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
--- a/devpoll.c
+++ b/devpoll.c
@ -23,9 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/resource.h>
--- a/epoll.c
+++ b/epoll.c
@ -24,9 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <stdint.h>
 #include <sys/types.h>
--- a/evdns.c
+++ b/evdns.c
@ -35,9 +35,7 @@
 */

 #include <sys/types.h>
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_DNS_USE_FTIME_FOR_ID
 #include <sys/timeb.h>
--- a/event.c
+++ b/event.c
@ -24,9 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/event_tagging.c
+++ b/event_tagging.c
@ -24,9 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
--- a/evmap.c
+++ b/evmap.c
@ -23,9 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/evport.c
+++ b/evport.c
@ -50,9 +50,7 @@
 * As in the select(2) implementation, signals are handled by evsignal.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/time.h>
 #include <sys/queue.h>
--- a/evrpc.c
+++ b/evrpc.c
@ -24,9 +24,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
--- a/evthread_pthread.c
+++ b/evthread_pthread.c
@ -23,9 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */
 #define _GNU_SOURCE
--- a/evthread_win32.c
+++ b/evthread_win32.c
@ -23,9 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/evutil.c
+++ b/evutil.c
@ -23,9 +23,8 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
+
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/http.c
+++ b/http.c
@ -25,9 +25,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
+
 #define _REENTRANT

 #ifdef _EVENT_HAVE_SYS_PARAM_H
--- a/kqueue.c
+++ b/kqueue.c
@ -26,9 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #define _GNU_SOURCE

--- a/listener.c
+++ b/listener.c
@ -26,9 +26,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/log.c
+++ b/log.c
@ -37,9 +37,7 @@
 * SUCH DAMAGE.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #include <winsock2.h>
--- a/poll.c
+++ b/poll.c
@ -26,9 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
--- a/sample/event-test.c
+++ b/sample/event-test.c
@ -3,9 +3,7 @@
 * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent
 */

-#ifdef HAVE_CONFIG_H
-#include "event-config.h"
-#endif
+#include <event-config.h>

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/sample/signal-test.c
+++ b/sample/signal-test.c
@ -6,9 +6,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
-#include "event-config.h"
-#endif
+#include <event-config.h>

 #include <sys/stat.h>
 #ifndef WIN32
--- a/sample/time-test.c
+++ b/sample/time-test.c
@ -5,9 +5,7 @@

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
-#include "event-config.h"
-#endif
+#include <event-config.h>

 #include <sys/stat.h>
 #ifndef WIN32
--- a/select.c
+++ b/select.c
@ -26,9 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
--- a/signal.c
+++ b/signal.c
@ -26,9 +26,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
--- a/strlcpy-internal.h
+++ b/strlcpy-internal.h
@ -5,9 +5,7 @@
 extern "C" {
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif /* HAVE_CONFIG_H */

 #ifndef _EVENT_HAVE_STRLCPY
 #include <string.h>
--- a/strlcpy.c
+++ b/strlcpy.c
@ -33,9 +33,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp

 #include <sys/types.h>

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif /* HAVE_CONFIG_H */

 #ifndef _EVENT_HAVE_STRLCPY
 #include "strlcpy-internal.h"
--- a/test/bench.c
+++ b/test/bench.c
@ -33,9 +33,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/bench_cascade.c
+++ b/test/bench_cascade.c
@ -25,9 +25,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/bench_http.c
+++ b/test/bench_http.c
@ -25,9 +25,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress.c
+++ b/test/regress.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_bufferevent.c
+++ b/test/regress_bufferevent.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@ -31,9 +31,7 @@
 #include <ws2tcpip.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_http.c
+++ b/test/regress_http.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_main.c
+++ b/test/regress_main.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #ifdef _EVENT___func__
 #define __func__ _EVENT___func__
--- a/test/regress_pthread.c
+++ b/test/regress_pthread.c
@ -24,9 +24,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <stdio.h>
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@ -30,9 +30,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/regress_util.c
+++ b/test/regress_util.c
@ -29,9 +29,8 @@
 #include <ws2tcpip.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
+
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@ -29,9 +29,7 @@
 #include <windows.h>
 #endif

-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif

 #include <sys/types.h>
 #ifndef WIN32
--- a/test/test-eof.c
+++ b/test/test-eof.c
@ -2,10 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
-

 #ifdef WIN32
 #include <winsock2.h>
--- a/test/test-init.c
+++ b/test/test-init.c
@ -2,10 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
-

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/test-time.c
+++ b/test/test-time.c
@ -2,10 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
-

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/test/test-weof.c
+++ b/test/test-weof.c
@ -2,10 +2,7 @@
 * Compile with:
 * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
 */
-#ifdef HAVE_CONFIG_H
 #include "event-config.h"
-#endif
-

 #ifdef WIN32
 #include <winsock2.h>