Backup most of the changes to the event library. At this point the only
remaining changes are in event.c and event.h, plus everything in the WIN32-Code directory. I still have to find a way to make it working on Windows without these changes, but I have good hopes. However, the the code in WIN32-Code will have to stay there as it's more stable than the one provided by the libevent project. This commit was SVN r11386.
Этот коммит содержится в:
родитель
918d1e018f
Коммит
a9be163fa7
@ -329,7 +329,7 @@ struct { \
|
||||
} while (0)
|
||||
|
||||
#ifndef RB_AUGMENT
|
||||
#define RB_AUGMENT(x) {}
|
||||
#define RB_AUGMENT(x)
|
||||
#endif
|
||||
|
||||
#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
|
||||
|
@ -27,12 +27,10 @@
|
||||
#ifndef _EVENT_INTERNAL_H_
|
||||
#define _EVENT_INTERNAL_H_
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef RB_HEAD(opal_event_tree, opal_event) opal_event_tree;
|
||||
|
||||
struct event_base {
|
||||
const struct opal_eventop *evsel;
|
||||
void *evbase;
|
||||
@ -48,10 +46,10 @@ struct event_base {
|
||||
struct opal_event_list eventqueue;
|
||||
struct timeval event_tv;
|
||||
|
||||
opal_event_tree timetree;
|
||||
RB_HEAD(opal_event_tree, opal_event) timetree;
|
||||
};
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -267,7 +267,7 @@ opal_evsignal_process(void)
|
||||
}
|
||||
}
|
||||
|
||||
memset((void*) opal_evsigcaught, 0, sizeof(opal_evsigcaught));
|
||||
memset(opal_evsigcaught, 0, sizeof(opal_evsigcaught));
|
||||
opal_evsignal_caught = 0;
|
||||
}
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user