cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 04:50:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reduce windows header includes in our own headers.

Browse Source 
It turns out that absolutely everything that was including
windows.h was doing so needlessly; our headers don't need it,
so we should just include winsock2.h (since that's where
struct timeval is defined).

Pre-2.0 code will use the old headers, which include windows.h
for them, so we aren't breaking source compatibility with 1.4.

This solves the bug where we were leaving WIN32_LEAN_AND_MEAN
defined, in roughly the same way that buying an automobile
solves the question of what to give your coachman for boxing
day.
This commit is contained in:
Nick Mathewson 2010-02-03 02:09:19 -05:00
parent 27c9a40f15
commit da6135e356
10 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evdns.c
View File

@ -101,7 +101,9 @@
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#ifndef _WIN32_IE
#define _WIN32_IE 0x400 #define _WIN32_IE 0x400
#endif
#include <shlobj.h> #include <shlobj.h>
#endif #endif

7
include/event2/bufferevent.h
View File

@ -65,13 +65,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
/* Just for error reporting - use other constants otherwise */ /* Just for error reporting - use other constants otherwise */
#define BEV_EVENT_READING 0x01 /**< error encountered while reading */ #define BEV_EVENT_READING 0x01 /**< error encountered while reading */
#define BEV_EVENT_WRITING 0x02 /**< error encountered while writing */ #define BEV_EVENT_WRITING 0x02 /**< error encountered while writing */

6
include/event2/bufferevent_struct.h
View File

@ -51,12 +51,6 @@ extern "C" {
/* For struct event */ /* For struct event */
#include <event2/event_struct.h> #include <event2/event_struct.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
struct event_watermark { struct event_watermark {
size_t low; size_t low;
size_t high; size_t high;

6
include/event2/event.h
View File

@ -50,12 +50,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
struct event_base; struct event_base;
struct event; struct event;
struct event_config; struct event_config;

6
include/event2/event_compat.h
View File

@ -49,12 +49,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
/** /**
Initialize the event API. Initialize the event API.

7
include/event2/event_struct.h
View File

@ -49,13 +49,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#include <winsock2.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
#define EVLIST_TIMEOUT 0x01 #define EVLIST_TIMEOUT 0x01
#define EVLIST_INSERTED 0x02 #define EVLIST_INSERTED 0x02
#define EVLIST_SIGNAL 0x04 #define EVLIST_SIGNAL 0x04

7
include/event2/http.h
View File

@ -34,13 +34,6 @@
extern "C" { extern "C" {
#endif #endif
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
/* In case we haven't included the right headers yet. */ /* In case we haven't included the right headers yet. */
struct evbuffer; struct evbuffer;
struct event_base; struct event_base;

6
include/event2/http_compat.h
View File

@ -49,12 +49,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
/** /**
* Start an HTTP server on the specified address and port * Start an HTTP server on the specified address and port
* *

6
include/event2/tag.h
View File

@ -48,12 +48,6 @@ extern "C" {
/* For int types. */ /* For int types. */
#include <event2/util.h> #include <event2/util.h>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
struct evbuffer; struct evbuffer;
/* /*

4
include/event2/util.h
View File

@ -63,6 +63,10 @@ extern "C" {
#include <netdb.h> #include <netdb.h>
#endif #endif
#ifdef WIN32
#include <winsock2.h>
#endif
/* Integer type definitions for types that are supposed to be defined in the /* Integer type definitions for types that are supposed to be defined in the
* C99-specified stdint.h. Shamefully, some platforms do not include * C99-specified stdint.h. Shamefully, some platforms do not include
* stdint.h, so we need to replace it. (If you are on a platform like this, * stdint.h, so we need to replace it. (If you are on a platform like this,